Improvements to PSP & Added .net3.5 build target

Asnivor · Oct 10, 2017 · 4d5bbb9 · 4d5bbb9
1 parent 9f71f9a
commit 4d5bbb9
Show file tree

Hide file tree

Showing 24 changed files with 827 additions and 106 deletions.
diff --git a/DiscTools.sln b/DiscTools.sln
@@ -16,6 +16,8 @@ Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution
 		README.md = README.md
 	EndProjectSection
 EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "DiscToolsNET35", "DiscTools\DiscToolsNET35.csproj", "{3812D52D-0A1A-4DE1-9C61-53C62FCCCB67}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -38,6 +40,10 @@ Global
 		{C17B6927-A5C4-4AB5-A9AD-BCFA8F10C392}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{C17B6927-A5C4-4AB5-A9AD-BCFA8F10C392}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{C17B6927-A5C4-4AB5-A9AD-BCFA8F10C392}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3812D52D-0A1A-4DE1-9C61-53C62FCCCB67}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3812D52D-0A1A-4DE1-9C61-53C62FCCCB67}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3812D52D-0A1A-4DE1-9C61-53C62FCCCB67}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3812D52D-0A1A-4DE1-9C61-53C62FCCCB67}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE

diff --git a/DiscTools/DiscInspector.cs b/DiscTools/DiscInspector.cs
@@ -20,7 +20,7 @@ public partial class DiscInspector
         //public ISOFile iso;
 
         public DiscInspector()
-        {   
+        {
 
         }
 

diff --git a/DiscTools/DiscToolsNET20.csproj b/DiscTools/DiscToolsNET20.csproj
@@ -63,9 +63,13 @@
     <Compile Include="Inspection\InterroPSX.cs" />
     <Compile Include="Inspection\InterroAll.cs" />
     <Compile Include="Inspection\Interrogator.cs" />
-    <Compile Include="Inspection\Statics\NintendoLookup.cs" />
-    <Compile Include="Inspection\Statics\SonyLookup.cs" />
+    <Compile Include="Inspection\Statics\Nintendo.cs" />
+    <Compile Include="Inspection\Statics\Sony.cs" />
+    <Compile Include="Inspection\Statics\SonyMethods\SFO.cs" />
     <Compile Include="Inspection\TextConverters.cs" />
+    <Compile Include="Objects\ISOData.cs" />
+    <Compile Include="Objects\CDiData.cs" />
+    <Compile Include="Objects\PSPData.cs" />
     <Compile Include="OtherFormats\CDi.cs" />
     <Compile Include="ISO\API_MednaDisc.cs" />
     <Compile Include="ISO\Bit.cs" />

diff --git a/DiscTools/DiscToolsNET35.csproj b/DiscTools/DiscToolsNET35.csproj
@@ -0,0 +1,148 @@
+<?xml version="1.0" encoding="utf-8"?>
+<Project ToolsVersion="14.0" DefaultTargets="Build" xmlns="http://schemas.microsoft.com/developer/msbuild/2003">
+  <Import Project="$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props" Condition="Exists('$(MSBuildExtensionsPath)\$(MSBuildToolsVersion)\Microsoft.Common.props')" />
+  <PropertyGroup>
+    <BaseIntermediateOutputPath>obj\net452\</BaseIntermediateOutputPath>
+    <Configuration Condition=" '$(Configuration)' == '' ">Debug</Configuration>
+    <Platform Condition=" '$(Platform)' == '' ">AnyCPU</Platform>
+    <ProjectGuid>{3812D52D-0A1A-4DE1-9C61-53C62FCCCB67}</ProjectGuid>
+    <OutputType>Library</OutputType>
+    <AppDesignerFolder>Properties</AppDesignerFolder>
+    <RootNamespace>DiscTools</RootNamespace>
+    <AssemblyName>DiscTools</AssemblyName>
+    <TargetFrameworkVersion>v3.5</TargetFrameworkVersion>
+    <FileAlignment>512</FileAlignment>
+    <TargetFrameworkProfile />
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|AnyCPU' ">
+    <DebugSymbols>true</DebugSymbols>
+    <DebugType>full</DebugType>
+    <Optimize>false</Optimize>
+    <OutputPath>bin\Debug\net35\</OutputPath>
+    <DefineConstants>TRACE;DEBUG;NET35</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+    <Prefer32Bit>false</Prefer32Bit>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|AnyCPU' ">
+    <DebugType>pdbonly</DebugType>
+    <Optimize>true</Optimize>
+    <OutputPath>bin\Release\net35\</OutputPath>
+    <DefineConstants>TRACE;NET35</DefineConstants>
+    <ErrorReport>prompt</ErrorReport>
+    <WarningLevel>4</WarningLevel>
+    <Prefer32Bit>false</Prefer32Bit>
+    <AllowUnsafeBlocks>true</AllowUnsafeBlocks>
+  </PropertyGroup>
+  <ItemGroup>
+    <Reference Include="System" />
+    <Reference Include="System.Data" />
+    <Reference Include="System.Data.DataSetExtensions" />
+    <Reference Include="System.Xml" />
+    <Reference Include="System.Xml.Linq" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="CompilerServices.cs" />
+    <Compile Include="CueHandler.cs" />
+    <Compile Include="DiscInspector.cs" />
+    <Compile Include="Inspection\InterroDiscJuggler.cs" />
+    <Compile Include="Inspection\InterroPSP.cs" />
+    <Compile Include="Inspection\InterroWii.cs" />
+    <Compile Include="Inspection\InterroGamecube.cs" />
+    <Compile Include="Inspection\InterroSpecific.cs" />
+    <Compile Include="Inspection\InterroDreamcast.cs" />
+    <Compile Include="Inspection\InterroAmiga.cs" />
+    <Compile Include="Inspection\InterroCDi.cs" />
+    <Compile Include="Inspection\Interro3DO.cs" />
+    <Compile Include="Inspection\InterroPCECD.cs" />
+    <Compile Include="Inspection\InterroPCFX.cs" />
+    <Compile Include="Inspection\InterroPlaydia.cs" />
+    <Compile Include="Inspection\InterroNeoGeoCD.cs" />
+    <Compile Include="Inspection\InterroSegaCD.cs" />
+    <Compile Include="Inspection\InterroSaturn.cs" />
+    <Compile Include="Inspection\InterroPSX.cs" />
+    <Compile Include="Inspection\InterroAll.cs" />
+    <Compile Include="Inspection\Interrogator.cs" />
+    <Compile Include="Inspection\Statics\Nintendo.cs" />
+    <Compile Include="Inspection\Statics\Sony.cs" />
+    <Compile Include="Inspection\Statics\SonyMethods\SFO.cs" />
+    <Compile Include="Inspection\TextConverters.cs" />
+    <Compile Include="Objects\CDiData.cs" />
+    <Compile Include="Objects\ISOData.cs" />
+    <Compile Include="Objects\PSPData.cs" />
+    <Compile Include="OtherFormats\CDi.cs" />
+    <Compile Include="ISO\API_MednaDisc.cs" />
+    <Compile Include="ISO\Bit.cs" />
+    <Compile Include="ISO\BitReverse.cs" />
+    <Compile Include="ISO\Disc.cs" />
+    <Compile Include="ISO\DiscDecoding.cs" />
+    <Compile Include="ISO\DiscExceptions.cs" />
+    <Compile Include="ISO\DiscFormats\Blobs\Blob_ECM.cs" />
+    <Compile Include="ISO\DiscFormats\Blobs\Blob_RawFile.cs" />
+    <Compile Include="ISO\DiscFormats\Blobs\Blob_WaveFile.cs" />
+    <Compile Include="ISO\DiscFormats\Blobs\Blog_ZeroPadAdapter.cs" />
+    <Compile Include="ISO\DiscFormats\Blobs\IBlob.cs" />
+    <Compile Include="ISO\DiscFormats\Blobs\RiffMaster.cs" />
+    <Compile Include="ISO\DiscFormats\CCD_format.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CueFileResolver.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CUE_Compile.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CUE_Context.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CUE_File.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CUE_Load.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CUE_Parse.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CUE_Synths.cs" />
+    <Compile Include="ISO\DiscFormats\CUE\CUE_Types.cs" />
+    <Compile Include="ISO\DiscFormats\M3U_File.cs" />
+    <Compile Include="ISO\DiscFormats\SBI_format.cs" />
+    <Compile Include="ISO\DiscFormats\TOC_format.cs" />
+    <Compile Include="ISO\DiscHasher.cs" />
+    <Compile Include="ISO\DiscIdentifier.cs" />
+    <Compile Include="ISO\DiscJob.cs" />
+    <Compile Include="ISO\DiscMountJob.cs" />
+    <Compile Include="ISO\DiscMountPolicy.cs" />
+    <Compile Include="ISO\DiscSectorReader.cs" />
+    <Compile Include="ISO\DiscStream.cs" />
+    <Compile Include="ISO\DiscStructure.cs" />
+    <Compile Include="ISO\DiscSubQ.cs" />
+    <Compile Include="ISO\DiscTOC.cs" />
+    <Compile Include="ISO\DiscTypes.cs" />
+    <Compile Include="ISO\DiscUtils.cs" />
+    <Compile Include="ISO\EndianBitConverter.cs" />
+    <Compile Include="ISO\Internal\Algorithms\ECM.cs" />
+    <Compile Include="ISO\Internal\Algorithms\SubQ_CRC.cs" />
+    <Compile Include="ISO\Internal\Jobs\ApplySBIJob.cs" />
+    <Compile Include="ISO\Internal\Jobs\LoadSBIJob.cs" />
+    <Compile Include="ISO\Internal\Jobs\Synthesize_A0A1A2_Job.cs" />
+    <Compile Include="ISO\Internal\Jobs\Synthesize_DiscStructure_From_DiscTOC_Job.cs" />
+    <Compile Include="ISO\Internal\Jobs\Synthesize_DiscTOC_From_RawTOCEntries_Job.cs" />
+    <Compile Include="ISO\Internal\Jobs\Synthesize_Leadout_Job.cs" />
+    <Compile Include="ISO\Internal\SectorSynth.cs" />
+    <Compile Include="ISO\Internal\SynthUtils.cs" />
+    <Compile Include="ISO\Util.cs" />
+    <Compile Include="Objects\DiscData.cs" />
+    <Compile Include="SBI\SubQPatchData.cs" />
+    <Compile Include="SerialNumber.cs" />
+    <Compile Include="ISO\ISODirectoryNode.cs" />
+    <Compile Include="ISO\ISOFile.cs" />
+    <Compile Include="ISO\ISOFileNode.cs" />
+    <Compile Include="ISO\ISONode.cs" />
+    <Compile Include="ISO\ISONodeRecord.cs" />
+    <Compile Include="ISO\ISOVolumeDescriptor.cs" />
+    <Compile Include="Properties\AssemblyInfo.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <Compile Include="ISO\DiscMountJob.MednaDisc.cs" />
+  </ItemGroup>
+  <ItemGroup>
+    <None Include="packages.config" />
+  </ItemGroup>
+  <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
+  <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
+       Other similar extension points exist, see Microsoft.Common.targets.
+  <Target Name="BeforeBuild">
+  </Target>
+  <Target Name="AfterBuild">
+  </Target>
+  -->
+</Project>
diff --git a/DiscTools/DiscToolsNET452.csproj b/DiscTools/DiscToolsNET452.csproj
@@ -48,27 +48,32 @@
     <Compile Include="CompilerServices.cs" />
     <Compile Include="CueHandler.cs" />
     <Compile Include="DiscInspector.cs" />
-    <Compile Include="Inspection\Interro3DO.cs" />
-    <Compile Include="Inspection\InterroAll.cs" />
-    <Compile Include="Inspection\InterroAmiga.cs" />
-    <Compile Include="Inspection\InterroCDi.cs" />
     <Compile Include="Inspection\InterroDiscJuggler.cs" />
-    <Compile Include="Inspection\InterroDreamcast.cs" />
+    <Compile Include="Inspection\InterroPSP.cs" />
+    <Compile Include="Inspection\InterroWii.cs" />
     <Compile Include="Inspection\InterroGamecube.cs" />
-    <Compile Include="Inspection\Interrogator.cs" />
-    <Compile Include="Inspection\InterroNeoGeoCD.cs" />
+    <Compile Include="Inspection\InterroSpecific.cs" />
+    <Compile Include="Inspection\InterroDreamcast.cs" />
+    <Compile Include="Inspection\InterroAmiga.cs" />
+    <Compile Include="Inspection\InterroCDi.cs" />
+    <Compile Include="Inspection\Interro3DO.cs" />
     <Compile Include="Inspection\InterroPCECD.cs" />
     <Compile Include="Inspection\InterroPCFX.cs" />
     <Compile Include="Inspection\InterroPlaydia.cs" />
-    <Compile Include="Inspection\InterroPSP.cs" />
-    <Compile Include="Inspection\InterroPSX.cs" />
-    <Compile Include="Inspection\InterroSaturn.cs" />
+    <Compile Include="Inspection\InterroNeoGeoCD.cs" />
     <Compile Include="Inspection\InterroSegaCD.cs" />
-    <Compile Include="Inspection\InterroSpecific.cs" />
-    <Compile Include="Inspection\InterroWii.cs" />
-    <Compile Include="Inspection\Statics\NintendoLookup.cs" />
-    <Compile Include="Inspection\Statics\SonyLookup.cs" />
+    <Compile Include="Inspection\InterroSaturn.cs" />
+    <Compile Include="Inspection\InterroPSX.cs" />
+    <Compile Include="Inspection\InterroAll.cs" />
+    <Compile Include="Inspection\Interrogator.cs" />
+    <Compile Include="Inspection\Statics\Nintendo.cs" />
+    <Compile Include="Inspection\Statics\Sony.cs" />
+    <Compile Include="Inspection\Statics\SonyMethods\SFO.cs" />
     <Compile Include="Inspection\TextConverters.cs" />
+    <Compile Include="Objects\CDiData.cs" />
+    <Compile Include="Objects\ISOData.cs" />
+    <Compile Include="Objects\PSPData.cs" />
+    <Compile Include="OtherFormats\CDi.cs" />
     <Compile Include="ISO\API_MednaDisc.cs" />
     <Compile Include="ISO\Bit.cs" />
     <Compile Include="ISO\BitReverse.cs" />
@@ -118,7 +123,6 @@
     <Compile Include="ISO\Internal\SynthUtils.cs" />
     <Compile Include="ISO\Util.cs" />
     <Compile Include="Objects\DiscData.cs" />
-    <Compile Include="OtherFormats\CDi.cs" />
     <Compile Include="SBI\SubQPatchData.cs" />
     <Compile Include="SerialNumber.cs" />
     <Compile Include="ISO\ISODirectoryNode.cs" />
@@ -135,7 +139,6 @@
   <ItemGroup>
     <None Include="packages.config" />
   </ItemGroup>
-  <ItemGroup />
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.

diff --git a/DiscTools/Inspection/InterroAmiga.cs b/DiscTools/Inspection/InterroAmiga.cs
@@ -10,10 +10,10 @@ public partial class Interrogator
     {
         public bool ScanISOAmiga()
         {
-            if (discI.Data.ISOData.SystemIdentifier.Contains("CDTV") || discI.Data.ISOData.SystemIdentifier.Contains("AMIGA"))
+            if (discI.Data._ISOData.SystemIdentifier.Contains("CDTV") || discI.Data._ISOData.SystemIdentifier.Contains("AMIGA"))
             {
                 // is it CDTV or CD32?
-                foreach (var child in discI.Data.ISOData.ISOFiles)
+                foreach (var child in discI.Data._ISOData.ISOFiles)
                 {
                     if (child.Key.ToLower().Contains("cd32"))
                     {

diff --git a/DiscTools/Inspection/InterroDreamcast.cs b/DiscTools/Inspection/InterroDreamcast.cs
@@ -10,10 +10,10 @@ public partial class Interrogator
     {
         public bool ScanISODreamcast()
         {
-            if (discI.Data.ISOData.SystemIdentifier.Contains("SEGAKATANA"))
+            if (discI.Data._ISOData.SystemIdentifier.Contains("SEGAKATANA"))
             {
                 // store lba for IP.BIN
-                var cnf = discI.Data.ISOData.ISOFiles.Where(a => a.Key.Contains("IP.BIN")).FirstOrDefault();
+                var cnf = discI.Data._ISOData.ISOFiles.Where(a => a.Key.Contains("IP.BIN")).FirstOrDefault();
                 if (cnf.Key.Contains("IP.BIN"))
                 {
                     ifn = cnf.Value;

diff --git a/DiscTools/Inspection/InterroGamecube.cs b/DiscTools/Inspection/InterroGamecube.cs
@@ -40,7 +40,7 @@ public bool GetGamecubeData(string lbaString)
             discI.DetectedDiscType = DetectedDiscType.Gamecube;
 
             string consoleId = Encoding.Default.GetString(Encoding.Default.GetBytes(lbaString).Skip(0).Take(1).ToArray());
-            discI.Data.DeviceInformation = Statics.NintendoLookup.GetDiscId(consoleId);
+            discI.Data.DeviceInformation = Statics.Nintendo.GetDiscId(consoleId);
 
             // game name
             string gName = Encoding.Default.GetString(Encoding.Default.GetBytes(lbaString).Skip(32).Take(992).ToArray()).Trim().TrimEnd('\0');
@@ -52,12 +52,12 @@ public bool GetGamecubeData(string lbaString)
 
             // country code
             string cc = Encoding.Default.GetString(Encoding.Default.GetBytes(lbaString).Skip(3).Take(1).ToArray());
-            discI.Data.AreaCodes = Statics.NintendoLookup.GetRegion(cc);
+            discI.Data.AreaCodes = Statics.Nintendo.GetRegion(cc);
 
             // maker code
             string makerHex = Encoding.Default.GetString(Encoding.Default.GetBytes(lbaString).Skip(4).Take(2).ToArray());
 
-            discI.Data.Publisher = Statics.NintendoLookup.GetMaker(makerHex);
+            discI.Data.Publisher = Statics.Nintendo.GetMaker(makerHex);
 
             // disc id
             string discId = Encoding.Default.GetString(Encoding.Default.GetBytes(lbaString).Skip(6).Take(1).ToArray());

diff --git a/DiscTools/Inspection/InterroNeoGeoCD.cs b/DiscTools/Inspection/InterroNeoGeoCD.cs
@@ -10,7 +10,7 @@ public partial class Interrogator
     {
         public bool ScanISONeoGeoCD()
         {
-            var absTxt = discI.Data.ISOData.ISOFiles.Where(a => a.Key.Contains("ABS.TXT")).ToList();
+            var absTxt = discI.Data._ISOData.ISOFiles.Where(a => a.Key.Contains("ABS.TXT")).ToList();
             if (absTxt.Count == 0)
                 return false;
-Original file line number
+Diff line change
@@ Expand Up / @@ -20,7 +20,7 @@ public partial class DiscInspector @@
             //public ISOFile iso;
             public DiscInspector()
-            {
+            {
             }
@@ Expand Down @@