Add ClassLayoutTableTreeNode

ILSpy.AddIn/ILSpy.AddIn.csproj

@@ -31,7 +31,6 @@
   <PropertyGroup Condition="'$(Configuration)' == 'Release'">
     <DebugType>pdbonly</DebugType>
     <DebugSymbols>true</DebugSymbols>
-    <RunCodeAnalysis>true</RunCodeAnalysis>
   </PropertyGroup>
 
   <PropertyGroup Condition="'$(AppVeyor)' != ''">

ILSpy/ILSpy.csproj

@@ -135,6 +135,10 @@
     <Compile Include="Controls\SearchBox.cs" />
     <Compile Include="Controls\SortableGridViewColumn.cs" />
     <Compile Include="Controls\XamlResourceExtension.cs" />
+    <Compile Include="Metadata\CorTables\ClassLayoutTableTreeNode.cs">
+      <SubType>Code</SubType>
+      <Generator>MSBuild:Compile</Generator>
+    </Compile>
     <Compile Include="Metadata\DataGridCustomTextColumn.cs" />
     <Compile Include="Metadata\FlagsFilterControl.xaml.cs" />
     <Compile Include="Metadata\FlagsTooltip.xaml.cs" />

ILSpy/Metadata/CorTables/ClassLayoutTableTreeNode.cs

@@ -0,0 +1,135 @@
+// Copyright (c) 2011 AlphaSierraPapa for the SharpDevelop Team
+// 
+// Permission is hereby granted, free of charge, to any person obtaining a copy of this
+// software and associated documentation files (the "Software"), to deal in the Software
+// without restriction, including without limitation the rights to use, copy, modify, merge,
+// publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons
+// to whom the Software is furnished to do so, subject to the following conditions:
+// 
+// The above copyright notice and this permission notice shall be included in all copies or
+// substantial portions of the Software.
+// 
+// THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+// INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+// PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE
+// FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+// OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+// DEALINGS IN THE SOFTWARE.
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Reflection.Metadata;
+using System.Reflection.Metadata.Ecma335;
+using System.Runtime.InteropServices;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Controls;
+using ICSharpCode.Decompiler;
+using ICSharpCode.Decompiler.Disassembler;
+using ICSharpCode.Decompiler.IL;
+using ICSharpCode.Decompiler.Metadata;
+using ICSharpCode.ILSpy.TextView;
+using ICSharpCode.ILSpy.TreeNodes;
+
+namespace ICSharpCode.ILSpy.Metadata
+{
+	class ClassLayoutTableTreeNode : ILSpyTreeNode
+	{
+		private PEFile module;
+
+		public ClassLayoutTableTreeNode(PEFile module)
+		{
+			this.module = module;
+		}
+
+		public override object Text => $"0F ClassLayout ({module.Metadata.GetTableRowCount(TableIndex.ClassLayout)})";
+
+		public override object Icon => Images.Literal;
+
+		public unsafe override bool View(ViewModels.TabPageModel tabPage)
+		{
+			tabPage.Title = Text.ToString();
+			tabPage.SupportsLanguageSwitching = false;
+
+			var view = Helpers.PrepareDataGrid(tabPage);
+			var metadata = module.Metadata;
+
+			var list = new List<ClassLayoutEntry>();
+
+			var length = metadata.GetTableRowCount(TableIndex.ClassLayout);
+			byte* ptr = metadata.MetadataPointer;
+			int metadataOffset = module.Reader.PEHeaders.MetadataStartOffset;
+			for (int rid = 1; rid <= length; rid++) {
+				list.Add(new ClassLayoutEntry(module, ptr, metadataOffset, rid));
+			}
+
+			view.ItemsSource = list;
+
+			tabPage.Content = view;
+			return true;
+		}
+
+		readonly struct ClassLayout
+		{
+			public readonly ushort PackingSize;
+			public readonly EntityHandle Parent;
+			public readonly uint ClassSize;
+
+			public unsafe ClassLayout(byte *ptr, bool small)
+			{
+				PackingSize = (ushort)(ptr[0] | (ptr[1] << 8));
+				ClassSize = (uint)(ptr[2] | (ptr[3] << 8) | (ptr[4] << 16) | (ptr[5] << 24));
+				Parent = MetadataTokens.TypeDefinitionHandle(small ? (int)(ptr[6] | (ptr[7] << 8)) : (int)(ptr[6] | (ptr[7] << 8) | (ptr[8] << 16) | (ptr[9] << 24)));
+			}
+		}
+
+		unsafe struct ClassLayoutEntry
+		{
+			readonly PEFile module;
+			readonly MetadataReader metadata;
+			readonly ClassLayout classLayout;
+
+			public int RID { get; }
+
+			public int Token => 0x0F000000 | RID;
+
+			public int Offset { get; }
+
+			[StringFormat("X8")]
+			public int Parent => MetadataTokens.GetToken(classLayout.Parent);
+
+			public string ParentTooltip {
+				get {
+					return null;
+					ITextOutput output = new PlainTextOutput();
+					var context = new GenericContext(default(TypeDefinitionHandle), module);
+					((EntityHandle)classLayout.Parent).WriteTo(module, output, context);
+					return output.ToString();
+				}
+			}
+
+			[StringFormat("X4")]
+			public ushort PackingSize => classLayout.PackingSize;
+
+			[StringFormat("X8")]
+			public uint ClassSize => classLayout.ClassSize;
+
+			public ClassLayoutEntry(PEFile module, byte* ptr, int metadataOffset, int row)
+			{
+				this.module = module;
+				this.metadata = module.Metadata;
+				this.RID = row;
+				var rowOffset = metadata.GetTableMetadataOffset(TableIndex.ClassLayout)
+					+ metadata.GetTableRowSize(TableIndex.ClassLayout) * (row - 1);
+				this.Offset = metadataOffset + rowOffset;
+				this.classLayout = new ClassLayout(ptr, metadata.GetTableRowCount(TableIndex.TypeDef) <= ushort.MaxValue);
+			}
+		}
+
+		public override void Decompile(Language language, ITextOutput output, DecompilationOptions options)
+		{
+			language.WriteCommentLine(output, "CustomAttributes");
+		}
+	}
+}

ILSpy/Metadata/CorTables/CustomAttributeTableTreeNode.cs

@@ -82,7 +82,8 @@ namespace ICSharpCode.ILSpy.Metadata
 				+ metadata.GetTableMetadataOffset(TableIndex.CustomAttribute)
 				+ metadata.GetTableRowSize(TableIndex.CustomAttribute) * (RID - 1);
 
-			public int ParentHandle => MetadataTokens.GetToken(customAttr.Parent);
+			[StringFormat("X8")]
+			public int Parent => MetadataTokens.GetToken(customAttr.Parent);
 
 			public string ParentTooltip {
 				get {
@@ -93,7 +94,8 @@ namespace ICSharpCode.ILSpy.Metadata
 				}
 			}
 
-			public int ConstructorHandle => MetadataTokens.GetToken(customAttr.Constructor);
+			[StringFormat("X8")]
+			public int Constructor => MetadataTokens.GetToken(customAttr.Constructor);
 
 			public string ConstructorTooltip {
 				get {
@@ -104,7 +106,8 @@ namespace ICSharpCode.ILSpy.Metadata
 				}
 			}
 
-			public int ValueHandle => MetadataTokens.GetHeapOffset(customAttr.Value);
+			[StringFormat("X8")]
+			public int Value => MetadataTokens.GetHeapOffset(customAttr.Value);
 
 			public string ValueTooltip {
 				get {

ILSpy/Metadata/CorTables/GenericParamConstraintTableTreeNode.cs

@@ -85,16 +85,25 @@ namespace ICSharpCode.ILSpy.Metadata
 				+ metadata.GetTableMetadataOffset(TableIndex.GenericParamConstraint)
 				+ metadata.GetTableRowSize(TableIndex.GenericParamConstraint) * (RID-1);
 
-			public int OwnerHandle => MetadataTokens.GetToken(genericParamConstraint.Parameter);
+			[StringFormat("X8")]
+			public int Owner => MetadataTokens.GetToken(genericParamConstraint.Parameter);
 
-			public string Owner {
+			string ownerTooltip;
+
+			public string OwnerTooltip {
 				get {
-					ITextOutput output = new PlainTextOutput();
-					((EntityHandle)genericParamConstraint.Parameter).WriteTo(module, output, GenericContext.Empty);
-					return output.ToString();
+					if (ownerTooltip == null) {
+						ITextOutput output = new PlainTextOutput();
+						var p = metadata.GetGenericParameter(genericParamConstraint.Parameter);
+						output.Write("parameter " + p.Index + (p.Name.IsNil ? "" : " (" + metadata.GetString(p.Name) + ")") + " of ");
+						p.Parent.WriteTo(module, output, GenericContext.Empty);
+						ownerTooltip = output.ToString();
+					}
+					return ownerTooltip;
 				}
 			}
 
+			[StringFormat("X8")]
 			public int Type => MetadataTokens.GetToken(genericParamConstraint.Type);
 
 			public string TypeTooltip {
@@ -112,6 +121,7 @@ namespace ICSharpCode.ILSpy.Metadata
 				this.metadata = module.Metadata;
 				this.handle = handle;
 				this.genericParamConstraint = metadata.GetGenericParameterConstraint(handle);
+				this.ownerTooltip = null;
 			}
 		}
 

ILSpy/Metadata/CorTables/MemberRefTableTreeNode.cs

@@ -82,7 +82,8 @@ namespace ICSharpCode.ILSpy.Metadata
 				+ metadata.GetTableMetadataOffset(TableIndex.MemberRef)
 				+ metadata.GetTableRowSize(TableIndex.MemberRef) * (RID - 1);
 
-			public int ParentHandle => MetadataTokens.GetToken(memberRef.Parent);
+			[StringFormat("X8")]
+			public int Parent => MetadataTokens.GetToken(memberRef.Parent);
 
 			public string ParentTooltip {
 				get {
@@ -96,6 +97,7 @@ namespace ICSharpCode.ILSpy.Metadata
 
 			public string NameTooltip => $"{MetadataTokens.GetHeapOffset(memberRef.Name):X} \"{Name}\"";
 
+			[StringFormat("X8")]
 			public int Signature => MetadataTokens.GetHeapOffset(memberRef.Signature);
 
 			public string SignatureTooltip {

ILSpy/Metadata/MetadataTreeNode.cs

@@ -78,6 +78,7 @@ namespace ICSharpCode.ILSpy.Metadata
 			this.Children.Add(new ConstantTableTreeNode(module));
 			this.Children.Add(new CustomAttributeTableTreeNode(module));
 			this.Children.Add(new DeclSecurityTableTreeNode(module));
+			this.Children.Add(new ClassLayoutTableTreeNode(module));
 			this.Children.Add(new StandAloneSigTableTreeNode(module));
 			this.Children.Add(new EventTableTreeNode(module));
 			this.Children.Add(new PropertyTableTreeNode(module));