Bump version

ExtractionTool/ExtractionTool.csproj

@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.9.2</Version>
+        <Version>1.9.4</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->
@@ -66,8 +66,8 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.IO" Version="1.7.2" />
-        <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.8" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
+        <PackageReference Include="SabreTools.IO" Version="1.7.3" />
+        <PackageReference Include="System.Text.Encoding.CodePages" Version="9.0.9" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />
     </ItemGroup>
 
 </Project>

InfoPrint/InfoPrint.csproj

@@ -10,7 +10,7 @@
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.9.2</Version>
+        <Version>1.9.4</Version>
     </PropertyGroup>
 
     <!-- Support All Frameworks -->
@@ -32,7 +32,7 @@
     </ItemGroup>
 
     <ItemGroup>
-        <PackageReference Include="SabreTools.IO" Version="1.7.2" />
+        <PackageReference Include="SabreTools.IO" Version="1.7.3" />
         <PackageReference Include="SabreTools.Hashing" Version="1.5.0" />
     </ItemGroup>
 

SabreTools.Serialization/Printers/PortableExecutable.cs

@@ -36,14 +36,14 @@ namespace SabreTools.Serialization.Printers
             Print(builder, executable.COFFSymbolTable);
             Print(builder, executable.COFFStringTable);
             Print(builder, executable.AttributeCertificateTable);
-            Print(builder, executable.DelayLoadDirectoryTable);
+            Print(builder, executable.DelayLoadDirectoryTable, executable.SectionTable);
 
             // Named Sections
             Print(builder, executable.BaseRelocationTable, executable.SectionTable);
             Print(builder, executable.DebugTable);
-            Print(builder, executable.ExportTable);
+            Print(builder, executable.ExportTable, executable.SectionTable);
             Print(builder, executable.ImportTable, executable.SectionTable);
-            Print(builder, executable.ResourceDirectoryTable);
+            Print(builder, executable.ResourceDirectoryTable, executable.SectionTable);
         }
 
         private static void Print(StringBuilder builder, Models.MSDOS.ExecutableHeader? header)
@@ -502,7 +502,7 @@ namespace SabreTools.Serialization.Printers
             }
         }
 
-        private static void Print(StringBuilder builder, DelayLoadDirectoryTable? table)
+        private static void Print(StringBuilder builder, DelayLoadDirectoryTable? table, SectionHeader[]? sections)
         {
             builder.AppendLine("  Delay-Load Directory Table Information:");
             builder.AppendLine("  -------------------------");
@@ -515,16 +515,21 @@ namespace SabreTools.Serialization.Printers
 
             builder.AppendLine(table.Attributes, "  Attributes");
             builder.AppendLine(table.Name, "  Name RVA");
+            builder.AppendLine(table.Name.ConvertVirtualAddress(sections), "  Name physical address");
             builder.AppendLine(table.ModuleHandle, "  Module handle");
             builder.AppendLine(table.DelayImportAddressTable, "  Delay import address table RVA");
+            builder.AppendLine(table.DelayImportAddressTable.ConvertVirtualAddress(sections), "  Delay import address table physical address");
             builder.AppendLine(table.DelayImportNameTable, "  Delay import name table RVA");
+            builder.AppendLine(table.DelayImportNameTable.ConvertVirtualAddress(sections), "  Delay import name table physical address");
             builder.AppendLine(table.BoundDelayImportTable, "  Bound delay import table RVA");
+            builder.AppendLine(table.BoundDelayImportTable.ConvertVirtualAddress(sections), "  Bound delay import table physical address");
             builder.AppendLine(table.UnloadDelayImportTable, "  Unload delay import table RVA");
+            builder.AppendLine(table.UnloadDelayImportTable.ConvertVirtualAddress(sections), "  Unload delay import table physical address");
             builder.AppendLine(table.TimeStamp, "  Timestamp");
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, BaseRelocationBlock[]? entries, SectionHeader[]? table)
+        private static void Print(StringBuilder builder, BaseRelocationBlock[]? entries, SectionHeader[]? sections)
         {
             builder.AppendLine("  Base Relocation Table Information:");
             builder.AppendLine("  -------------------------");
@@ -541,7 +546,7 @@ namespace SabreTools.Serialization.Printers
 
                 builder.AppendLine($"  Base Relocation Table Entry {i}");
                 builder.AppendLine(baseRelocationTableEntry.PageRVA, "    Page RVA");
-                builder.AppendLine(baseRelocationTableEntry.PageRVA.ConvertVirtualAddress(table), "    Page physical address");
+                builder.AppendLine(baseRelocationTableEntry.PageRVA.ConvertVirtualAddress(sections), "    Page physical address");
                 builder.AppendLine(baseRelocationTableEntry.BlockSize, "    Block size");
                 builder.AppendLine();
 
@@ -597,7 +602,7 @@ namespace SabreTools.Serialization.Printers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, ExportTable? table)
+        private static void Print(StringBuilder builder, ExportTable? table, SectionHeader[]? sections)
         {
             builder.AppendLine("  Export Table Information:");
             builder.AppendLine("  -------------------------");
@@ -621,13 +626,17 @@ namespace SabreTools.Serialization.Printers
                 builder.AppendLine(table.ExportDirectoryTable.MajorVersion, "    Major version");
                 builder.AppendLine(table.ExportDirectoryTable.MinorVersion, "    Minor version");
                 builder.AppendLine(table.ExportDirectoryTable.NameRVA, "    Name RVA");
+                builder.AppendLine(table.ExportDirectoryTable.NameRVA.ConvertVirtualAddress(sections), "    Name physical address");
                 builder.AppendLine(table.ExportDirectoryTable.Name, "    Name");
                 builder.AppendLine(table.ExportDirectoryTable.OrdinalBase, "    Ordinal base");
                 builder.AppendLine(table.ExportDirectoryTable.AddressTableEntries, "    Address table entries");
                 builder.AppendLine(table.ExportDirectoryTable.NumberOfNamePointers, "    Number of name pointers");
                 builder.AppendLine(table.ExportDirectoryTable.ExportAddressTableRVA, "    Export address table RVA");
+                builder.AppendLine(table.ExportDirectoryTable.ExportAddressTableRVA.ConvertVirtualAddress(sections), "    Export address table physical address");
                 builder.AppendLine(table.ExportDirectoryTable.NamePointerRVA, "    Name pointer table RVA");
+                builder.AppendLine(table.ExportDirectoryTable.NamePointerRVA.ConvertVirtualAddress(sections), "    Name pointer table physical address");
                 builder.AppendLine(table.ExportDirectoryTable.OrdinalTableRVA, "    Ordinal table RVA");
+                builder.AppendLine(table.ExportDirectoryTable.OrdinalTableRVA.ConvertVirtualAddress(sections), "    Ordinal table physical address");
             }
             builder.AppendLine();
 
@@ -644,7 +653,8 @@ namespace SabreTools.Serialization.Printers
                     var entry = table.ExportAddressTable[i];
 
                     builder.AppendLine($"    Export Address Table Entry {i}");
-                    builder.AppendLine(entry.ExportRVA, "      Export RVA / Forwarder RVA");
+                    builder.AppendLine(entry.ExportRVA, "      Export / Forwarder RVA");
+                    builder.AppendLine(entry.ExportRVA.ConvertVirtualAddress(sections), "      Export / Forwarder physical address");
                 }
             }
 
@@ -708,7 +718,7 @@ namespace SabreTools.Serialization.Printers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, ImportTable? table, SectionHeader[]? sectionTable)
+        private static void Print(StringBuilder builder, ImportTable? table, SectionHeader[]? sections)
         {
             builder.AppendLine("  Import Table Information:");
             builder.AppendLine("  -------------------------");
@@ -734,13 +744,14 @@ namespace SabreTools.Serialization.Printers
 
                     builder.AppendLine($"    Import Directory Table Entry {i}");
                     builder.AppendLine(entry.ImportLookupTableRVA, "      Import lookup table RVA");
-                    builder.AppendLine(entry.ImportLookupTableRVA.ConvertVirtualAddress(sectionTable), "      Import lookup table Physical Address");
+                    builder.AppendLine(entry.ImportLookupTableRVA.ConvertVirtualAddress(sections), "      Import lookup table physical address");
                     builder.AppendLine(entry.TimeDateStamp, "      Time/Date stamp");
                     builder.AppendLine(entry.ForwarderChain, "      Forwarder chain");
                     builder.AppendLine(entry.NameRVA, "      Name RVA");
+                    builder.AppendLine(entry.NameRVA.ConvertVirtualAddress(sections), "      Name physical address");
                     builder.AppendLine(entry.Name, "      Name");
                     builder.AppendLine(entry.ImportAddressTableRVA, "      Import address table RVA");
-                    builder.AppendLine(entry.ImportAddressTableRVA.ConvertVirtualAddress(sectionTable), "      Import address table Physical Address");
+                    builder.AppendLine(entry.ImportAddressTableRVA.ConvertVirtualAddress(sections), "      Import address table physical address");
                 }
             }
 
@@ -781,7 +792,7 @@ namespace SabreTools.Serialization.Printers
                         else
                         {
                             builder.AppendLine(entry.HintNameTableRVA, "        Hint/Name table RVA");
-                            builder.AppendLine(entry.HintNameTableRVA.ConvertVirtualAddress(sectionTable), "        Hint/Name table Physical Address");
+                            builder.AppendLine(entry.HintNameTableRVA.ConvertVirtualAddress(sections), "        Hint/Name table physical address");
                         }
                     }
                 }
@@ -824,7 +835,7 @@ namespace SabreTools.Serialization.Printers
                         else
                         {
                             builder.AppendLine(entry.HintNameTableRVA, "        Hint/Name table RVA");
-                            builder.AppendLine(entry.HintNameTableRVA.ConvertVirtualAddress(sectionTable), "        Hint/Name table Physical Address");
+                            builder.AppendLine(entry.HintNameTableRVA.ConvertVirtualAddress(sections), "        Hint/Name table physical address");
                         }
                     }
                 }
@@ -853,7 +864,7 @@ namespace SabreTools.Serialization.Printers
             builder.AppendLine();
         }
 
-        private static void Print(StringBuilder builder, ResourceDirectoryTable? table)
+        private static void Print(StringBuilder builder, ResourceDirectoryTable? table, SectionHeader[]? sections)
         {
             builder.AppendLine("  Resource Directory Table Information:");
             builder.AppendLine("  -------------------------");
@@ -864,11 +875,11 @@ namespace SabreTools.Serialization.Printers
                 return;
             }
 
-            Print(table, level: 0, types: [], builder);
+            Print(builder, table, level: 0, types: [], sections);
             builder.AppendLine();
         }
 
-        private static void Print(ResourceDirectoryTable table, int level, List<object> types, StringBuilder builder)
+        private static void Print(StringBuilder builder, ResourceDirectoryTable table, int level, List<object> types, SectionHeader[]? sections)
         {
             string padding = new(' ', (level + 1) * 2);
 
@@ -903,12 +914,12 @@ namespace SabreTools.Serialization.Printers
                     else
                         newTypes.Add(entry.IntegerID);
 
-                    PrintResourceDirectoryEntry(entry, level + 1, newTypes, builder);
+                    Print(builder, entry, level + 1, newTypes, sections);
                 }
             }
         }
 
-        private static void PrintResourceDirectoryEntry(ResourceDirectoryEntry entry, int level, List<object> types, StringBuilder builder)
+        private static void Print(StringBuilder builder, ResourceDirectoryEntry entry, int level, List<object> types, SectionHeader[]? sections)
         {
             string padding = new(' ', (level + 1) * 2);
 
@@ -924,12 +935,12 @@ namespace SabreTools.Serialization.Printers
             }
 
             if (entry.DataEntry != null)
-                PrintResourceDataEntry(entry.DataEntry, level: level + 1, types, builder);
+                Print(builder, entry.DataEntry, level: level + 1, types, sections);
             else if (entry.Subdirectory != null)
-                Print(entry.Subdirectory, level: level + 1, types, builder);
+                Print(builder, entry.Subdirectory, level: level + 1, types, sections);
         }
 
-        private static void PrintResourceDataEntry(ResourceDataEntry entry, int level, List<object> types, StringBuilder builder)
+        private static void Print(StringBuilder builder, ResourceDataEntry entry, int level, List<object> types, SectionHeader[]? sections)
         {
             string padding = new(' ', (level + 1) * 2);
 
@@ -939,6 +950,7 @@ namespace SabreTools.Serialization.Printers
 
             builder.AppendLine(level, $"{padding}Entry level");
             builder.AppendLine(entry.DataRVA, $"{padding}Data RVA");
+            builder.AppendLine(entry.DataRVA.ConvertVirtualAddress(sections), $"{padding}Data physical address");
             builder.AppendLine(entry.Size, $"{padding}Size");
             builder.AppendLine(entry.Codepage, $"{padding}Codepage");
             builder.AppendLine(entry.Reserved, $"{padding}Reserved");

SabreTools.Serialization/SabreTools.Serialization.csproj

@@ -8,11 +8,13 @@
         <IncludeSourceRevisionInInformationalVersion>false</IncludeSourceRevisionInInformationalVersion>
         <IncludeSymbols>true</IncludeSymbols>
         <LangVersion>latest</LangVersion>
+        <!-- Added due to StormLibSharp -->
+        <NoWarn>CS8600;CS8601;CS8603;CS8604;CS8618;CS8625;CS8634;IL3000</NoWarn>
         <Nullable>enable</Nullable>
         <SuppressTfmSupportBuildWarnings>true</SuppressTfmSupportBuildWarnings>
         <SymbolPackageFormat>snupkg</SymbolPackageFormat>
         <TreatWarningsAsErrors>true</TreatWarningsAsErrors>
-        <Version>1.9.2</Version>
+        <Version>1.9.4</Version>
 
         <!-- Package Properties -->
         <Authors>Matt Nadareski</Authors>
@@ -26,6 +28,28 @@
         <PackageLicenseExpression>MIT</PackageLicenseExpression>
     </PropertyGroup>
 
+    <!-- Support All Frameworks -->
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR $(TargetFramework.StartsWith(`net4`))">
+        <RuntimeIdentifiers>win-x86;win-x64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`netcoreapp`)) OR $(TargetFramework.StartsWith(`net5`))">
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net6`)) OR $(TargetFramework.StartsWith(`net7`)) OR $(TargetFramework.StartsWith(`net8`)) OR $(TargetFramework.StartsWith(`net9`))">
+        <RuntimeIdentifiers>win-x86;win-x64;win-arm64;linux-x64;linux-arm64;osx-x64;osx-arm64</RuntimeIdentifiers>
+    </PropertyGroup>
+    <PropertyGroup Condition="$(RuntimeIdentifier.StartsWith(`osx-arm`))">
+        <TargetFrameworks>net6.0;net7.0;net8.0;net9.0</TargetFrameworks>
+    </PropertyGroup>
+
+    <!-- Set a build flag for Windows specifically -->
+    <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x86'">
+        <DefineConstants>$(DefineConstants);WINX86</DefineConstants>
+    </PropertyGroup>
+    <PropertyGroup Condition="'$(RuntimeIdentifier)'=='win-x64'">
+        <DefineConstants>$(DefineConstants);WINX64</DefineConstants>
+    </PropertyGroup>
+
     <!-- Exclude certain parts of external modules for by default -->
     <PropertyGroup>
         <DefaultItemExcludes>
@@ -36,9 +60,8 @@
         </DefaultItemExcludes>
     </PropertyGroup>
 
-    <!-- Exclude all external modules for .NET Framework 2.0, .NET Framework 3.5, or non-Windows
-    builds -->
-    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR !$(RuntimeIdentifier.StartsWith(`win-x86`))">
+    <!-- Exclude all external modules for .NET Framework 2.0, .NET Framework 3.5, or non-Windows builds -->
+    <PropertyGroup Condition="$(TargetFramework.StartsWith(`net2`)) OR $(TargetFramework.StartsWith(`net3`)) OR !($(RuntimeIdentifier.StartsWith(`win-x86`)) OR $(RuntimeIdentifier.StartsWith(`win-x64`)))">
         <DefaultItemExcludes>
             $(DefaultItemExcludes);
             _EXTERNAL\**
@@ -63,9 +86,9 @@
 
     <ItemGroup>
         <PackageReference Include="Newtonsoft.Json" Version="13.0.3" />
-        <PackageReference Include="SabreTools.ASN1" Version="1.6.2" />
+        <PackageReference Include="SabreTools.ASN1" Version="1.6.3" />
         <PackageReference Include="SabreTools.Hashing" Version="1.5.0" />
-        <PackageReference Include="SabreTools.IO" Version="1.7.2" />
+        <PackageReference Include="SabreTools.IO" Version="1.7.3" />
         <PackageReference Include="SabreTools.Models" Version="1.7.1" />
         <PackageReference Include="SabreTools.Matching" Version="1.6.0" />
         <PackageReference Include="SharpCompress" Version="0.40.0" Condition="!$(TargetFramework.StartsWith(`net2`)) AND !$(TargetFramework.StartsWith(`net3`)) AND !$(TargetFramework.StartsWith(`net40`)) AND !$(TargetFramework.StartsWith(`net452`))" />

SabreTools.Serialization/Wrappers/MoPaQ.Extraction.cs

@@ -1,6 +1,7 @@
 using System;
 using SabreTools.Serialization.Interfaces;
 #if (NET452_OR_GREATER || NETCOREAPP) && (WINX86 || WINX64)
+using System.IO;
 using StormLibSharp;
 #endif
 
@@ -42,7 +43,6 @@ namespace SabreTools.Serialization.Wrappers
                 // Loop over each entry
                 foreach (string sub in listfileLines)
                 {
-                    // Ensure directory separators are consistent
                     string filename = sub;
                     if (Path.DirectorySeparatorChar == '\\')
                         filename = filename.Replace('/', '\\');
@@ -50,7 +50,7 @@ namespace SabreTools.Serialization.Wrappers
                         filename = filename.Replace('\\', '/');
 
                     // Ensure the full output directory exists
-                    filename = Path.Combine(outDir, filename);
+                    filename = Path.Combine(outputDirectory, filename);
                     var directoryName = Path.GetDirectoryName(filename);
                     if (directoryName != null && !Directory.Exists(directoryName))
                         Directory.CreateDirectory(directoryName);

SabreTools.Serialization/Wrappers/PortableExecutable.Extraction.cs

@@ -174,6 +174,21 @@ namespace SabreTools.Serialization.Wrappers
                         extension = "uha";
                         break;
                     }
+                    else if (overlaySample.StartsWith([0x3C, 0x3F, 0x78, 0x6D, 0x6C]))
+                    {
+                        extension = "xml";
+                        break;
+                    }
+                    else if (overlaySample.StartsWith([0x3C, 0x00, 0x3F, 0x00, 0x78, 0x00, 0x6D, 0x00, 0x6C, 0x00]))
+                    {
+                        extension = "xml";
+                        break;
+                    }
+                    else if (overlaySample.StartsWith([0xFF, 0xFE, 0x3C, 0x00, 0x3F, 0x00, 0x78, 0x00, 0x6D, 0x00, 0x6C, 0x00]))
+                    {
+                        extension = "xml";
+                        break;
+                    }
                     else if (overlaySample.StartsWith([0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00]))
                     {
                         extension = "xz";
@@ -329,6 +344,21 @@ namespace SabreTools.Serialization.Wrappers
                             extension = "uha";
                             break;
                         }
+                        else if (resourceSample.StartsWith([0x3C, 0x3F, 0x78, 0x6D, 0x6C]))
+                        {
+                            extension = "xml";
+                            break;
+                        }
+                        else if (resourceSample.StartsWith([0x3C, 0x00, 0x3F, 0x00, 0x78, 0x00, 0x6D, 0x00, 0x6C, 0x00]))
+                        {
+                            extension = "xml";
+                            break;
+                        }
+                        else if (resourceSample.StartsWith([0xFF, 0xFE, 0x3C, 0x00, 0x3F, 0x00, 0x78, 0x00, 0x6D, 0x00, 0x6C, 0x00]))
+                        {
+                            extension = "xml";
+                            break;
+                        }
                         else if (resourceSample.StartsWith([0xFD, 0x37, 0x7A, 0x58, 0x5A, 0x00]))
                         {
                             extension = "xz";
@@ -375,7 +405,7 @@ namespace SabreTools.Serialization.Wrappers
                 return false;
             }
         }
-                
+
         /// <summary>
         /// Extract data from a SecuROM Matroschka Package
         /// </summary>

SabreTools.Serialization/Wrappers/PortableExecutable.cs

@@ -2029,22 +2029,19 @@ namespace SabreTools.Serialization.Wrappers
         /// <returns>Section strings on success, null on error</returns>
         public List<string>? GetSectionStrings(int index)
         {
+            // If we have no sections
+            if (SectionNames.Length == 0 || SectionTable == null || SectionTable.Length == 0)
+                return null;
+
+            // If the section doesn't exist
+            if (index < 0 || index >= SectionTable.Length)
+                return null;
+
             lock (_sectionStringDataLock)
             {
-                // If we have no sections
-                if (SectionNames.Length == 0 || SectionTable == null || SectionTable.Length == 0)
-                {
-                    _sectionStringData = [];
-                    return null;
-                }
-
                 // Create the section string array if we have to
                 _sectionStringData ??= new List<string>?[SectionNames.Length];
 
-                // If the section doesn't exist
-                if (index < 0 || index >= SectionTable.Length)
-                    return null;
-
                 // If we already have cached data, just use that immediately
                 if (_sectionStringData[index] != null)
                     return _sectionStringData[index];