Merge pull request #2147 from srutzky/patch-2

Fix "DLL Characteristics" meanings in Optional Header

ILSpy/Metadata/OptionalHeaderTreeNode.cs

@@ -112,19 +112,19 @@ namespace ICSharpCode.ILSpy.Metadata
 			{
 				FrameworkElementFactory dataGridFactory = new FrameworkElementFactory(typeof(DataGrid));
 				dataGridFactory.SetValue(DataGrid.ItemsSourceProperty, new[] {
-					new { Value = (flags & 0x0001) != 0, Meaning = "<0001> Unused" },
-					new { Value = (flags & 0x0002) != 0, Meaning = "<0002> Unused" },
-					new { Value = (flags & 0x0004) != 0, Meaning = "<0004> Unused" },
-					new { Value = (flags & 0x0008) != 0, Meaning = "<0008> Unused" },
+					new { Value = (flags & 0x0001) != 0, Meaning = "<0001> Process Init (Reserved)" },
+					new { Value = (flags & 0x0002) != 0, Meaning = "<0002> Process Term (Reserved)" },
+					new { Value = (flags & 0x0004) != 0, Meaning = "<0004> Thread Init (Reserved)" },
+					new { Value = (flags & 0x0008) != 0, Meaning = "<0008> Thread Term (Reserved)" },
 					new { Value = (flags & 0x0010) != 0, Meaning = "<0010> Unused" },
-					new { Value = (flags & 0x0020) != 0, Meaning = "<0020> ASLR with 64-bit address space" },
+					new { Value = (flags & 0x0020) != 0, Meaning = "<0020> Image can handle a high entropy 64-bit virtual address space (ASLR)" },
 					new { Value = (flags & 0x0040) != 0, Meaning = "<0040> DLL can be relocated at load time" },
 					new { Value = (flags & 0x0080) != 0, Meaning = "<0080> Code integrity checks are enforced" },
 					new { Value = (flags & 0x0100) != 0, Meaning = "<0100> Image is NX compatible" },
 					new { Value = (flags & 0x0200) != 0, Meaning = "<0200> Isolation aware, but do not isolate the image" },
 					new { Value = (flags & 0x0400) != 0, Meaning = "<0400> Does not use structured exception handling (SEH)" },
 					new { Value = (flags & 0x0800) != 0, Meaning = "<0800> Do not bind the image" },
-					new { Value = (flags & 0x1000) != 0, Meaning = "<1000> Image should execute in an AppContainer" },
+					new { Value = (flags & 0x1000) != 0, Meaning = "<1000> Image must execute in an AppContainer" },
 					new { Value = (flags & 0x2000) != 0, Meaning = "<2000> Driver is a WDM Driver" },
 					new { Value = (flags & 0x4000) != 0, Meaning = "<4000> Image supports Control Flow Guard" },
 					new { Value = (flags & 0x8000) != 0, Meaning = "<8000> Image is Terminal Server aware" },