From b94167e111923cd1d9312bac02b04cb2249a7eb2 Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 12 Feb 2020 15:55:12 -0300 Subject: [PATCH 1/2] Changing GetSymbolReader from PdbReaderProvider, when we create a Module from stream we don't have the filename, and it's not necessary to create an EmbeddedPortablePdbReaderProvider, so I've moved the check to after the creation of EmbeddedPortablePdbReaderProvider. --- Test/Mono.Cecil.Tests/BaseTestFixture.cs | 48 ++++++++++++++++++++++- Test/Mono.Cecil.Tests/PortablePdbTests.cs | 23 +++++++++++ symbols/pdb/Mono.Cecil.Pdb/PdbHelper.cs | 3 +- 3 files changed, 72 insertions(+), 2 deletions(-) diff --git a/Test/Mono.Cecil.Tests/BaseTestFixture.cs b/Test/Mono.Cecil.Tests/BaseTestFixture.cs index 046791bfa..005c541ad 100644 --- a/Test/Mono.Cecil.Tests/BaseTestFixture.cs +++ b/Test/Mono.Cecil.Tests/BaseTestFixture.cs @@ -137,6 +137,11 @@ public static void TestIL (string file, Action test, bool veri Run (new ILTestCase (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath)); } + public static void TestBinary (string file, Action test, bool verify = true, bool readOnly = true, Type symbolReaderProvider = null, Type symbolWriterProvider = null, IAssemblyResolver assemblyResolver = null, bool applyWindowsRuntimeProjections = false, [CallerFilePath] string sourceFilePath = "") + { + Run (new BinaryTestCase (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath)); + } + static void Run (TestCase testCase) { using (var runner = new TestRunner (testCase, TestCaseType.ReadDeferred)) @@ -235,7 +240,22 @@ public override string ModuleLocation } } } + class BinaryTestCase : ModuleTestCase { + public BinaryTestCase (string file, Action test, bool verify, bool readOnly, Type symbolReaderProvider, Type symbolWriterProvider, IAssemblyResolver assemblyResolver, bool applyWindowsRuntimeProjections, string sourceFilePath = "") + : base (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath) + { + } + + public byte[] BinaryStream + { + get + { + byte[] bytes = System.IO.File.ReadAllBytes(ModuleLocation); + return bytes; + } + } + } class TestRunner : IDisposable { readonly TestCase test_case; @@ -278,6 +298,28 @@ ModuleDefinition GetModule () } } + ModuleDefinition GetModuleFromBinary () + { + var test_case_binary = test_case as BinaryTestCase; + var stream = test_case_binary.BinaryStream; + + var parameters = new ReaderParameters { + SymbolReaderProvider = GetSymbolReaderProvider (), + AssemblyResolver = GetAssemblyResolver () + }; + + switch (type) { + case TestCaseType.ReadImmediate: + parameters.ReadingMode = ReadingMode.Immediate; + return ModuleDefinition.ReadModule (new MemoryStream(stream), parameters); + case TestCaseType.ReadDeferred: + parameters.ReadingMode = ReadingMode.Deferred; + return ModuleDefinition.ReadModule (new MemoryStream (stream), parameters); + default: + return null; + } + } + ISymbolReaderProvider GetSymbolReaderProvider () { if (test_case.SymbolReaderProvider == null) @@ -330,7 +372,11 @@ ModuleDefinition RoundTrip (string location, ReaderParameters reader_parameters, public void RunTest () { - var module = GetModule (); + ModuleDefinition module; + if (test_case is BinaryTestCase) + module = GetModuleFromBinary(); + else + module = GetModule (); if (module == null) return; diff --git a/Test/Mono.Cecil.Tests/PortablePdbTests.cs b/Test/Mono.Cecil.Tests/PortablePdbTests.cs index e741865fa..37056ce5b 100644 --- a/Test/Mono.Cecil.Tests/PortablePdbTests.cs +++ b/Test/Mono.Cecil.Tests/PortablePdbTests.cs @@ -5,6 +5,7 @@ using NUnit.Framework; using Mono.Cecil.Cil; +using Mono.Cecil.Pdb; using Mono.Cecil.PE; namespace Mono.Cecil.Tests { @@ -368,6 +369,28 @@ public void EmbeddedCompressedPortablePdb () }, symbolReaderProvider: typeof (EmbeddedPortablePdbReaderProvider), symbolWriterProvider: typeof (EmbeddedPortablePdbWriterProvider)); } + [Test] + public void EmbeddedCompressedPortablePdbFromStream () + { + TestBinary("EmbeddedCompressedPdbTarget.exe", module => { + Assert.IsTrue (module.HasDebugHeader); + + var header = module.GetDebugHeader (); + + Assert.IsNotNull (header); + Assert.AreEqual (2, header.Entries.Length); + + var cv = header.Entries [0]; + Assert.AreEqual (ImageDebugType.CodeView, cv.Directory.Type); + + var eppdb = header.Entries [1]; + Assert.AreEqual (ImageDebugType.EmbeddedPortablePdb, eppdb.Directory.Type); + Assert.AreEqual (0x0100, eppdb.Directory.MajorVersion); + Assert.AreEqual (0x0100, eppdb.Directory.MinorVersion); + }, symbolReaderProvider: typeof (PdbReaderProvider), symbolWriterProvider: null); + } + + void TestPortablePdbModule (Action test) { TestModule ("PdbTarget.exe", test, symbolReaderProvider: typeof (PortablePdbReaderProvider), symbolWriterProvider: typeof (PortablePdbWriterProvider)); diff --git a/symbols/pdb/Mono.Cecil.Pdb/PdbHelper.cs b/symbols/pdb/Mono.Cecil.Pdb/PdbHelper.cs index 2008eb002..2b513cd11 100644 --- a/symbols/pdb/Mono.Cecil.Pdb/PdbHelper.cs +++ b/symbols/pdb/Mono.Cecil.Pdb/PdbHelper.cs @@ -39,7 +39,6 @@ public sealed class PdbReaderProvider : ISymbolReaderProvider { public ISymbolReader GetSymbolReader (ModuleDefinition module, string fileName) { Mixin.CheckModule (module); - Mixin.CheckFileName (fileName); if (module.HasDebugHeader) { var header = module.GetDebugHeader (); @@ -47,6 +46,8 @@ public ISymbolReader GetSymbolReader (ModuleDefinition module, string fileName) if (entry != null) return new EmbeddedPortablePdbReaderProvider ().GetSymbolReader (module, fileName); } + + Mixin.CheckFileName (fileName); return Mixin.IsPortablePdb (Mixin.GetPdbFileName (fileName)) ? new PortablePdbReaderProvider ().GetSymbolReader (module, fileName) From 1a0b9fca321b5f0b77ce987917579e136527461b Mon Sep 17 00:00:00 2001 From: Thays Grazia Date: Wed, 12 Feb 2020 19:42:17 -0300 Subject: [PATCH 2/2] Removing test infrastructure. --- Test/Mono.Cecil.Tests/BaseTestFixture.cs | 48 +---------------------- Test/Mono.Cecil.Tests/PortablePdbTests.cs | 29 ++++++++------ 2 files changed, 18 insertions(+), 59 deletions(-) diff --git a/Test/Mono.Cecil.Tests/BaseTestFixture.cs b/Test/Mono.Cecil.Tests/BaseTestFixture.cs index 005c541ad..046791bfa 100644 --- a/Test/Mono.Cecil.Tests/BaseTestFixture.cs +++ b/Test/Mono.Cecil.Tests/BaseTestFixture.cs @@ -137,11 +137,6 @@ public static void TestIL (string file, Action test, bool veri Run (new ILTestCase (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath)); } - public static void TestBinary (string file, Action test, bool verify = true, bool readOnly = true, Type symbolReaderProvider = null, Type symbolWriterProvider = null, IAssemblyResolver assemblyResolver = null, bool applyWindowsRuntimeProjections = false, [CallerFilePath] string sourceFilePath = "") - { - Run (new BinaryTestCase (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath)); - } - static void Run (TestCase testCase) { using (var runner = new TestRunner (testCase, TestCaseType.ReadDeferred)) @@ -240,22 +235,7 @@ public override string ModuleLocation } } } - class BinaryTestCase : ModuleTestCase { - public BinaryTestCase (string file, Action test, bool verify, bool readOnly, Type symbolReaderProvider, Type symbolWriterProvider, IAssemblyResolver assemblyResolver, bool applyWindowsRuntimeProjections, string sourceFilePath = "") - : base (file, test, verify, readOnly, symbolReaderProvider, symbolWriterProvider, assemblyResolver, applyWindowsRuntimeProjections, sourceFilePath) - { - } - - public byte[] BinaryStream - { - get - { - byte[] bytes = System.IO.File.ReadAllBytes(ModuleLocation); - return bytes; - } - } - } class TestRunner : IDisposable { readonly TestCase test_case; @@ -298,28 +278,6 @@ ModuleDefinition GetModule () } } - ModuleDefinition GetModuleFromBinary () - { - var test_case_binary = test_case as BinaryTestCase; - var stream = test_case_binary.BinaryStream; - - var parameters = new ReaderParameters { - SymbolReaderProvider = GetSymbolReaderProvider (), - AssemblyResolver = GetAssemblyResolver () - }; - - switch (type) { - case TestCaseType.ReadImmediate: - parameters.ReadingMode = ReadingMode.Immediate; - return ModuleDefinition.ReadModule (new MemoryStream(stream), parameters); - case TestCaseType.ReadDeferred: - parameters.ReadingMode = ReadingMode.Deferred; - return ModuleDefinition.ReadModule (new MemoryStream (stream), parameters); - default: - return null; - } - } - ISymbolReaderProvider GetSymbolReaderProvider () { if (test_case.SymbolReaderProvider == null) @@ -372,11 +330,7 @@ ModuleDefinition RoundTrip (string location, ReaderParameters reader_parameters, public void RunTest () { - ModuleDefinition module; - if (test_case is BinaryTestCase) - module = GetModuleFromBinary(); - else - module = GetModule (); + var module = GetModule (); if (module == null) return; diff --git a/Test/Mono.Cecil.Tests/PortablePdbTests.cs b/Test/Mono.Cecil.Tests/PortablePdbTests.cs index 37056ce5b..fe60dc82a 100644 --- a/Test/Mono.Cecil.Tests/PortablePdbTests.cs +++ b/Test/Mono.Cecil.Tests/PortablePdbTests.cs @@ -372,22 +372,27 @@ public void EmbeddedCompressedPortablePdb () [Test] public void EmbeddedCompressedPortablePdbFromStream () { - TestBinary("EmbeddedCompressedPdbTarget.exe", module => { - Assert.IsTrue (module.HasDebugHeader); + var bytes = File.ReadAllBytes (GetAssemblyResourcePath ("EmbeddedCompressedPdbTarget.exe")); + var parameters = new ReaderParameters { + ReadSymbols = true, + SymbolReaderProvider = new PdbReaderProvider () + }; - var header = module.GetDebugHeader (); + var module = ModuleDefinition.ReadModule (new MemoryStream(bytes), parameters); + Assert.IsTrue (module.HasDebugHeader); - Assert.IsNotNull (header); - Assert.AreEqual (2, header.Entries.Length); + var header = module.GetDebugHeader (); - var cv = header.Entries [0]; - Assert.AreEqual (ImageDebugType.CodeView, cv.Directory.Type); + Assert.IsNotNull (header); + Assert.AreEqual (2, header.Entries.Length); - var eppdb = header.Entries [1]; - Assert.AreEqual (ImageDebugType.EmbeddedPortablePdb, eppdb.Directory.Type); - Assert.AreEqual (0x0100, eppdb.Directory.MajorVersion); - Assert.AreEqual (0x0100, eppdb.Directory.MinorVersion); - }, symbolReaderProvider: typeof (PdbReaderProvider), symbolWriterProvider: null); + var cv = header.Entries [0]; + Assert.AreEqual (ImageDebugType.CodeView, cv.Directory.Type); + + var eppdb = header.Entries [1]; + Assert.AreEqual (ImageDebugType.EmbeddedPortablePdb, eppdb.Directory.Type); + Assert.AreEqual (0x0100, eppdb.Directory.MajorVersion); + Assert.AreEqual (0x0100, eppdb.Directory.MinorVersion); }