:wqPe32 and Pe32Plus -> PE32 and PE32Plus.

Washi1337 · Sep 16, 2022 · d954be0 · d954be0
1 parent b6fa3ed
commit d954be0
Show file tree

Hide file tree

Showing 17 changed files with 38 additions and 33 deletions.
diff --git a/src/AsmResolver.DotNet/ModuleDefinition.cs b/src/AsmResolver.DotNet/ModuleDefinition.cs
@@ -574,7 +574,7 @@ public OptionalHeaderMagic PEKind
         {
             get;
             set;
-        } = OptionalHeaderMagic.Pe32;
+        } = OptionalHeaderMagic.PE32;
 
         /// <summary>
         /// Gets or sets the subsystem to use when running the underlying portable executable (PE) file.

diff --git a/src/AsmResolver.PE.File/Headers/OptionalHeader.cs b/src/AsmResolver.PE.File/Headers/OptionalHeader.cs
@@ -58,11 +58,11 @@ public static OptionalHeader FromReader(ref BinaryStreamReader reader, bool igno
 
             switch (header.Magic)
             {
-                case OptionalHeaderMagic.Pe32:
+                case OptionalHeaderMagic.PE32:
                     header.BaseOfData = reader.ReadUInt32();
                     header.ImageBase = reader.ReadUInt32();
                     break;
-                case OptionalHeaderMagic.Pe32Plus:
+                case OptionalHeaderMagic.PE32Plus:
                     header.ImageBase = reader.ReadUInt64();
                     break;
                 default:
@@ -84,7 +84,7 @@ public static OptionalHeader FromReader(ref BinaryStreamReader reader, bool igno
             header.SubSystem = (SubSystem)reader.ReadUInt16();
             header.DllCharacteristics = (DllCharacteristics)reader.ReadUInt16();
 
-            if (header.Magic == OptionalHeaderMagic.Pe32)
+            if (header.Magic == OptionalHeaderMagic.PE32)
             {
                 header.SizeOfStackReserve = reader.ReadUInt32();
                 header.SizeOfStackCommit = reader.ReadUInt32();
@@ -120,7 +120,7 @@ public OptionalHeaderMagic Magic
         {
             get;
             set;
-        } = OptionalHeaderMagic.Pe32;
+        } = OptionalHeaderMagic.PE32;
 
         /// <summary>
         /// Gets or sets the major linker version used to link the portable executable (PE) file.
@@ -403,7 +403,7 @@ public IList<DataDirectory> DataDirectories
         public override uint GetPhysicalSize()
         {
             // TODO: make configurable?
-            return Magic == OptionalHeaderMagic.Pe32 ? 0xE0u : 0xF0u;
+            return Magic == OptionalHeaderMagic.PE32 ? 0xE0u : 0xF0u;
         }
 
         /// <inheritdoc />
@@ -422,11 +422,11 @@ public override void Write(IBinaryStreamWriter writer)
 
             switch (Magic)
             {
-                case OptionalHeaderMagic.Pe32:
+                case OptionalHeaderMagic.PE32:
                     writer.WriteUInt32(BaseOfData);
                     writer.WriteUInt32((uint)ImageBase);
                     break;
-                case OptionalHeaderMagic.Pe32Plus:
+                case OptionalHeaderMagic.PE32Plus:
                     writer.WriteUInt64(ImageBase);
                     break;
                 default:
@@ -448,7 +448,7 @@ public override void Write(IBinaryStreamWriter writer)
             writer.WriteUInt16((ushort)SubSystem);
             writer.WriteUInt16((ushort)DllCharacteristics);
 
-            if (Magic == OptionalHeaderMagic.Pe32)
+            if (Magic == OptionalHeaderMagic.PE32)
             {
                 writer.WriteUInt32((uint)SizeOfStackReserve);
                 writer.WriteUInt32((uint)SizeOfStackCommit);

diff --git a/src/AsmResolver.PE.File/Headers/OptionalHeaderMagic.cs b/src/AsmResolver.PE.File/Headers/OptionalHeaderMagic.cs
@@ -8,11 +8,16 @@ public enum OptionalHeaderMagic : ushort
         /// <summary>
         /// Indicates the binary contains a 32-bit portable executable file.
         /// </summary>
-        Pe32 = 0x010B,
-        
+        PE32 = 0x010B,
+
         /// <summary>
         /// Indicates the binary contains a 64-bit portable executable file.
         /// </summary>
-        Pe32Plus = 0x020B,
+        PE32Plus = 0x020B,
+
+        /// <summary>
+        /// Indicates the binary contains a 64-bit portable executable file.
+        /// </summary>
+        PE64 = PE32Plus
     }
-}
+}
diff --git a/src/AsmResolver.PE.File/PEFile.cs b/src/AsmResolver.PE.File/PEFile.cs
@@ -372,7 +372,7 @@ public void UpdateHeaders()
             FileHeader.NumberOfSections = (ushort) Sections.Count;
 
             var relocation = new RelocationParameters(OptionalHeader.ImageBase, 0, 0,
-                OptionalHeader.Magic == OptionalHeaderMagic.Pe32);
+                OptionalHeader.Magic == OptionalHeaderMagic.PE32);
 
             FileHeader.UpdateOffsets(relocation.WithOffsetRva(
                 DosHeader.NextHeaderOffset + 4,
@@ -408,7 +408,7 @@ public void AlignSections()
                 OptionalHeader.ImageBase,
                 OptionalHeader.SizeOfHeaders.Align(OptionalHeader.FileAlignment),
                 OptionalHeader.SizeOfHeaders.Align(OptionalHeader.SectionAlignment),
-                OptionalHeader.Magic == OptionalHeaderMagic.Pe32);
+                OptionalHeader.Magic == OptionalHeaderMagic.PE32);
 
             for (int i = 0; i < Sections.Count; i++)
             {

diff --git a/src/AsmResolver.PE.File/SerializedPEFile.cs b/src/AsmResolver.PE.File/SerializedPEFile.cs
@@ -39,7 +39,7 @@ public SerializedPEFile(in BinaryStreamReader reader, PEMappingMode mode)
             FileHeader = FileHeader.FromReader(ref _reader);
             OptionalHeader = OptionalHeader.FromReader(ref _reader);
             _originalImageBase = OptionalHeader.ImageBase;
-            _is32Bit = OptionalHeader.Magic == OptionalHeaderMagic.Pe32;
+            _is32Bit = OptionalHeader.Magic == OptionalHeaderMagic.PE32;
 
             // Read section headers.
             _reader.Offset = OptionalHeader.Offset + FileHeader.SizeOfOptionalHeader;

diff --git a/src/AsmResolver.PE/DotNet/Builder/ManagedPEFileBuilder.cs b/src/AsmResolver.PE/DotNet/Builder/ManagedPEFileBuilder.cs
@@ -66,7 +66,7 @@ public ManagedPEBuilderContext(IPEImage image)
                 if (image.DotNetDirectory is null)
                     throw new ArgumentException("Image does not contain a .NET directory.");
 
-                ImportDirectory = new ImportDirectoryBuffer(image.PEKind == OptionalHeaderMagic.Pe32);
+                ImportDirectory = new ImportDirectoryBuffer(image.PEKind == OptionalHeaderMagic.PE32);
                 ExportDirectory = new ExportDirectoryBuffer();
                 DotNetSegment = new DotNetSegmentBuffer(image.DotNetDirectory);
                 ResourceDirectory = new ResourceDirectoryBuffer();

diff --git a/src/AsmResolver.PE/DotNet/StrongName/StrongNameSigner.cs b/src/AsmResolver.PE/DotNet/StrongName/StrongNameSigner.cs
@@ -101,7 +101,7 @@ public void SignImage(Stream imageStream, AssemblyHashAlgorithm hashAlgorithm)
             hashBuilder.ZeroRange(new OffsetRange(peChecksumOffset, peChecksumOffset + sizeof(uint)));
 
             // Zero certificate directory entry.
-            uint optionalHeaderSize = file.OptionalHeader.Magic == OptionalHeaderMagic.Pe32
+            uint optionalHeaderSize = file.OptionalHeader.Magic == OptionalHeaderMagic.PE32
                 ? OptionalHeader.OptionalHeader32SizeExcludingDataDirectories
                 : OptionalHeader.OptionalHeader64SizeExcludingDataDirectories;
             ulong certificateEntryOffset = file.OptionalHeader.Offset

diff --git a/src/AsmResolver.PE/Imports/SerializedImportedModule.cs b/src/AsmResolver.PE/Imports/SerializedImportedModule.cs
@@ -68,7 +68,7 @@ protected override IList<ImportedSymbol> GetSymbols()
             if (IsEmpty)
                 return result;
 
-            bool is32Bit = _context.File.OptionalHeader.Magic == OptionalHeaderMagic.Pe32;
+            bool is32Bit = _context.File.OptionalHeader.Magic == OptionalHeaderMagic.PE32;
             (ulong ordinalMask, int pointerSize) = is32Bit
                 ? (0x8000_0000ul, sizeof(uint))
                 : (0x8000_0000_0000_0000ul, sizeof(ulong));

diff --git a/src/AsmResolver.PE/PEImage.cs b/src/AsmResolver.PE/PEImage.cs
@@ -209,7 +209,7 @@ public OptionalHeaderMagic PEKind
         {
             get;
             set;
-        } = OptionalHeaderMagic.Pe32;
+        } = OptionalHeaderMagic.PE32;
 
         /// <inheritdoc />
         public SubSystem SubSystem

diff --git a/src/AsmResolver.PE/PEReaderContext.cs b/src/AsmResolver.PE/PEReaderContext.cs
@@ -56,7 +56,7 @@ public PEReaderParameters Parameters
         public RelocationParameters GetRelocation(ulong offset, uint rva)
         {
             return new RelocationParameters(File.OptionalHeader.ImageBase, offset, rva,
-                File.OptionalHeader.Magic == OptionalHeaderMagic.Pe32);
+                File.OptionalHeader.Magic == OptionalHeaderMagic.PE32);
         }
 
         /// <inheritdoc />

diff --git a/src/AsmResolver.PE/Tls/SerializedTlsDirectory.cs b/src/AsmResolver.PE/Tls/SerializedTlsDirectory.cs
@@ -68,7 +68,7 @@ protected override TlsCallbackCollection GetCallbackFunctions()
             var file = _context.File;
             var optionalHeader = file.OptionalHeader;
             ulong imageBase = optionalHeader.ImageBase;
-            bool is32Bit = optionalHeader.Magic == OptionalHeaderMagic.Pe32;
+            bool is32Bit = optionalHeader.Magic == OptionalHeaderMagic.PE32;
 
             if (!file.TryCreateReaderAtRva((uint) (_addressOfCallbacks - imageBase), out var reader))
             {

diff --git a/test/AsmResolver.DotNet.Tests/AssemblyResolverTest.cs b/test/AsmResolver.DotNet.Tests/AssemblyResolverTest.cs
@@ -175,7 +175,7 @@ public void PreferResolveFromGac32If32BitAssembly(bool legacy)
             module.IsBit32Preferred = true;
             module.IsBit32Required = true;
             module.MachineType = MachineType.I386;
-            module.PEKind = OptionalHeaderMagic.Pe32;
+            module.PEKind = OptionalHeaderMagic.PE32;
 
             var resolved = module.CorLibTypeFactory.CorLibScope.GetAssembly()!.Resolve();
             Assert.NotNull(resolved);
@@ -196,7 +196,7 @@ public void PreferResolveFromGac64If64BitAssembly(bool legacy)
             module.IsBit32Preferred = false;
             module.IsBit32Required = false;
             module.MachineType = MachineType.Amd64;
-            module.PEKind = OptionalHeaderMagic.Pe32Plus;
+            module.PEKind = OptionalHeaderMagic.PE32Plus;
 
             var resolved = module.CorLibTypeFactory.CorLibScope.GetAssembly()!.Resolve();
             Assert.NotNull(resolved);

diff --git a/test/AsmResolver.DotNet.Tests/Code/Native/NativeMethodBodyTest.cs b/test/AsmResolver.DotNet.Tests/Code/Native/NativeMethodBodyTest.cs
@@ -36,13 +36,13 @@ private static NativeMethodBody CreateDummyBody(bool isVoid, bool is32Bit)
             module.Attributes &= ~DotNetDirectoryFlags.ILOnly;
             if (is32Bit)
             {
-                module.PEKind = OptionalHeaderMagic.Pe32;
+                module.PEKind = OptionalHeaderMagic.PE32;
                 module.MachineType = MachineType.I386;
                 module.Attributes |= DotNetDirectoryFlags.Bit32Required;
             }
             else
             {
-                module.PEKind = OptionalHeaderMagic.Pe32Plus;
+                module.PEKind = OptionalHeaderMagic.PE32Plus;
                 module.MachineType = MachineType.Amd64;
             }
 

diff --git a/test/AsmResolver.DotNet.Tests/MethodDefinitionTest.cs b/test/AsmResolver.DotNet.Tests/MethodDefinitionTest.cs
@@ -216,13 +216,13 @@ private static AssemblyDefinition CreateDummyLibraryWithExport(int methodCount,
             {
                 module.Attributes |= DotNetDirectoryFlags.Bit32Required;
                 module.FileCharacteristics |= Characteristics.Dll | Characteristics.Machine32Bit;
-                module.PEKind = OptionalHeaderMagic.Pe32;
+                module.PEKind = OptionalHeaderMagic.PE32;
                 module.MachineType = MachineType.I386;
             }
             else
             {
                 module.FileCharacteristics |= Characteristics.Dll;
-                module.PEKind = OptionalHeaderMagic.Pe32Plus;
+                module.PEKind = OptionalHeaderMagic.PE32Plus;
                 module.MachineType = MachineType.Amd64;
             }
 

diff --git a/test/AsmResolver.PE.Tests/DotNet/Builder/ManagedPEFileBuilderTest.cs b/test/AsmResolver.PE.Tests/DotNet/Builder/ManagedPEFileBuilderTest.cs
@@ -62,7 +62,7 @@ public void HelloWorld32BitTo64Bit()
 
             // Change machine type and pe kind to 64-bit
             image.MachineType = MachineType.Amd64;
-            image.PEKind = OptionalHeaderMagic.Pe32Plus;
+            image.PEKind = OptionalHeaderMagic.PE32Plus;
 
             // Rebuild
             var builder = new ManagedPEFileBuilder();
@@ -82,7 +82,7 @@ public void HelloWorld64BitTo32Bit()
 
             // Change machine type and pe kind to 32-bit
             image.MachineType = MachineType.I386;
-            image.PEKind = OptionalHeaderMagic.Pe32;
+            image.PEKind = OptionalHeaderMagic.PE32;
 
             // Rebuild
             var builder = new ManagedPEFileBuilder();

diff --git a/test/AsmResolver.PE.Tests/DotNet/Builder/MixedModeAssemblyTest.cs b/test/AsmResolver.PE.Tests/DotNet/Builder/MixedModeAssemblyTest.cs
@@ -34,13 +34,13 @@ private static void ReplaceBodyWithNativeCode(IPEImage image, CodeSegment body,
             if (is32bit)
             {
                 image.MachineType = MachineType.I386;
-                image.PEKind = OptionalHeaderMagic.Pe32;
+                image.PEKind = OptionalHeaderMagic.PE32;
                 image.DotNetDirectory.Flags |= DotNetDirectoryFlags.Bit32Required;
             }
             else
             {
                 image.MachineType = MachineType.Amd64;
-                image.PEKind = OptionalHeaderMagic.Pe32Plus;
+                image.PEKind = OptionalHeaderMagic.PE32Plus;
             }
 
             // Access metadata.

diff --git a/test/AsmResolver.PE.Tests/Tls/TlsDirectoryTest.cs b/test/AsmResolver.PE.Tests/Tls/TlsDirectoryTest.cs
@@ -143,7 +143,7 @@ public void Persistent(bool is32Bit)
                 },
                 OptionalHeader =
                 {
-                    Magic = is32Bit ? OptionalHeaderMagic.Pe32 : OptionalHeaderMagic.Pe32Plus
+                    Magic = is32Bit ? OptionalHeaderMagic.PE32 : OptionalHeaderMagic.PE32Plus
                 },
                 Sections =
                 {