Merge pull request #128 from titto/master

Fixed 2 issues with enums

Author: KN4CK3R

ReClass.NET/Nodes/EnumNode.cs

@@ -51,42 +51,62 @@ public BaseNumericNode GetUnderlayingNode()
 			throw new Exception(); // TODO
 		}
 
-		public long ReadValueFromMemory(MemoryBuffer memory)
+		private long ReadValueFromMemory(MemoryBuffer memory)
+		{
+            switch (Enum.Size)
+            {
+                case EnumDescription.UnderlyingTypeSize.OneByte:
+                    return memory.ReadInt8(Offset);
+                case EnumDescription.UnderlyingTypeSize.TwoBytes:
+                    return memory.ReadInt16(Offset);
+                case EnumDescription.UnderlyingTypeSize.FourBytes:
+                    return memory.ReadInt32(Offset);
+                case EnumDescription.UnderlyingTypeSize.EightBytes:
+                    return memory.ReadInt64(Offset);
+            }
+
+            throw new Exception(); // TODO
+        }
+
+		private ulong ReadFlagsValueFromMemory(MemoryBuffer memory)
 		{
-			switch (Enum.Size)
-			{
-				case EnumDescription.UnderlyingTypeSize.OneByte:
-					return memory.ReadInt8(Offset);
-				case EnumDescription.UnderlyingTypeSize.TwoBytes:
-					return memory.ReadInt16(Offset);
-				case EnumDescription.UnderlyingTypeSize.FourBytes:
-					return memory.ReadInt32(Offset);
-				case EnumDescription.UnderlyingTypeSize.EightBytes:
-					return memory.ReadInt64(Offset);
-			}
-
-			throw new Exception(); // TODO
-		}
-
-		private string GetStringRepresentation(long value)
+            // Flags should be read as an unsigned value.
+            switch (Enum.Size)
+            {
+                case EnumDescription.UnderlyingTypeSize.OneByte:
+                    return memory.ReadUInt8(Offset);
+                case EnumDescription.UnderlyingTypeSize.TwoBytes:
+                    return memory.ReadUInt16(Offset);
+                case EnumDescription.UnderlyingTypeSize.FourBytes:
+                    return memory.ReadUInt32(Offset);
+                case EnumDescription.UnderlyingTypeSize.EightBytes:
+                    return memory.ReadUInt64(Offset);
+            }
+
+            throw new Exception(); // TODO
+        }
+
+        private string GetTextRepresentation(MemoryBuffer memory)
+        {
+            return Enum.UseFlagsMode ? GetFlagsStringRepresentation(memory) : GetStringRepresentation(memory);
+        }
+
+		private string GetStringRepresentation(MemoryBuffer memory)
 		{
-			if (!Enum.UseFlagsMode)
-			{
+                var value = ReadValueFromMemory(memory);
 				var index = Enum.Values.FindIndex(kv => kv.Value == value);
 				if (index == -1)
 				{
 					return value.ToString();
 				}
 
 				return Enum.Values[index].Key;
-			}
-
-			return GetFlagsStringRepresentation(value);
 		}
 
-		private string GetFlagsStringRepresentation(long value)
-		{
-			var result = (ulong)value;
+		private string GetFlagsStringRepresentation(MemoryBuffer memory)
+		{
+            var value = ReadFlagsValueFromMemory(memory);
+            var result = value;
 
 			var values = Enum.Values;
 
@@ -163,9 +183,9 @@ public override Size Draw(ViewInfo view, int x, int y)
 
 			x = AddText(view, x, y, view.Settings.TextColor, HotSpot.NoneId, "=") + view.Font.Width;
 
-			var value = ReadValueFromMemory(view.Memory);
+            var text = GetTextRepresentation(view.Memory);
 
-			x = AddText(view, x, y, view.Settings.TextColor, HotSpot.NoneId, GetStringRepresentation(value)) + view.Font.Width;
+			x = AddText(view, x, y, view.Settings.TextColor, HotSpot.NoneId, text) + view.Font.Width;
 
 			x = AddComment(view, x, y);
 

ReClass.NET/Project/EnumDescription.cs

@@ -26,7 +26,7 @@ public enum UnderlyingTypeSize
 
 		public void SetData(bool useFlagsMode, UnderlyingTypeSize size, IEnumerable<KeyValuePair<string, long>> values)
 		{
-			var temp = values.OrderBy(t => t.Key).ToList();
+			var temp = values.OrderBy(t => t.Value).ToList();
 
 			if (useFlagsMode)
 			{