Diff of /trunk/RomCheater/Docking/UI/UIMemoryViewer.cs

Parent Directory | Revision Log | Patch

--- trunk/RomCheater/Docking/UI/UIMemoryViewer.cs	2012/06/09 22:23:15	356
+++ trunk/RomCheater/Docking/UI/UIMemoryViewer.cs	2012/06/10 00:47:58	357
@@ -113,8 +113,8 @@
         public uint MemoryRangeSize { get { if (MemoryRangeStart > 0) { return (uint)(MemorySizeConstants.MaximumAddress - MemoryRangeStart); } return MemorySizeConstants.MaximumAddress; } set { } }
         #endregion
         #region IAcceptPEData members
-        private PEReader.PEData peData { get; set; }
-        public void SetPEViewerData(PEReader.PEData peData) { this.peData = peData; }
+        private IPEDData peData { get; set; }
+        public void SetPEViewerData(IPEDData peData) { this.peData = peData; }
         #endregion
         public void GotoTop() { this.CURRENT_TOP_ADDR = 0; }
         public void GotoBottom() { uint size = (uint)MemoryRangeSize; this.CURRENT_TOP_ADDR = (int)((size - 1) - max_ram_view); }
@@ -569,16 +569,20 @@
                 ImageBase = this.peData.NTHeader.OptionalHeader32._ImageBase;
                 uint ib = Convert.ToUInt32(ImageBase);
                 //logger.Debug.WriteLine("UIMemoryViewer::btnGotoImageBase_Click(0x{0:x8})", ib);
-                    txthexGoto.Value = ib;
+                txthexGoto.Value = ib;
                 btnGotoAddress.PerformClick();
             }
             else
             {
                 ImageBase = this.peData.NTHeader.OptionalHeader64._ImageBase;
-                ulong ib = Convert.ToUInt64(ImageBase);                
+                ulong ib = Convert.ToUInt64(ImageBase);
                 txthexGoto.Value = (long)ib;
                 btnGotoAddress.PerformClick();
             }
+            IntPtr lpBaseAddress = this.AcceptedProcess.MainModule.BaseAddress;
+            int BaseAddress = lpBaseAddress.ToInt32();
+            txthexGoto.Value = BaseAddress;
+            btnGotoAddress.PerformClick();
         }
 
     }