Skip to content

Commit fcf2305

Browse files
committed
Requested changes
1 parent 0f3f85b commit fcf2305

File tree

2 files changed

+21
-10
lines changed

2 files changed

+21
-10
lines changed

Forms/MainForm.cs

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -183,8 +183,8 @@ private void detachToolStripMenuItem_Click(object sender, EventArgs e)
183183

184184
private void newClassToolStripButton_Click(object sender, EventArgs e)
185185
{
186-
var Address = remoteProcess.IsValid ? remoteProcess.GetModuleByName(remoteProcess.Process.Name).Start : IntPtr.Zero;
187-
var node = ClassNode.Create(Address);
186+
var address = remoteProcess.GetModuleByName(remoteProcess.Process?.Name)?.Start ?? IntPtr.Zero;
187+
var node = ClassNode.Create(address);
188188
node.AddBytes(64);
189189

190190
classesView.SelectedClass = node;

Nodes/ClassNode.cs

Lines changed: 19 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -44,33 +44,44 @@ public IntPtr Address
4444
public string AddressFormula { get; set; }
4545

4646
public event NodeEventHandler NodesChanged;
47-
48-
internal ClassNode(bool notifyClassCreated, IntPtr Address = default(IntPtr))
47+
48+
internal ClassNode(bool notifyClassCreated, IntPtr address)
4949
{
5050
Contract.Ensures(AddressFormula != null);
5151

5252
Uuid = new NodeUuid(true);
53-
if (Address == IntPtr.Zero)
53+
54+
if (address == IntPtr.Zero)
5455
{
5556
#if WIN64
56-
this.Address = (IntPtr)0x140000000;
57+
Address = (IntPtr)0x140000000;
5758
#else
58-
this.Address = (IntPtr)0x400000;
59+
Address = (IntPtr)0x400000;
5960
#endif
6061
}
6162
else
62-
this.Address = Address;
63+
Address = address;
6364
if (notifyClassCreated)
6465
{
6566
ClassCreated?.Invoke(this);
6667
}
6768
}
6869

69-
public static ClassNode Create(IntPtr Address = default(IntPtr))
70+
internal ClassNode(bool notifyClassCreated) : this(notifyClassCreated, IntPtr.Zero)
71+
{
72+
73+
}
74+
75+
public static ClassNode Create(IntPtr address)
7076
{
7177
Contract.Ensures(Contract.Result<ClassNode>() != null);
7278

73-
return new ClassNode(true, Address);
79+
return new ClassNode(true, address);
80+
}
81+
82+
public static ClassNode Create()
83+
{
84+
return Create(IntPtr.Zero);
7485
}
7586

7687
public override void Intialize()

0 commit comments

Comments
 (0)