Skip to content

Commit bb0eff9

Browse files
committed
Fixed name hiding.
1 parent 83729fe commit bb0eff9

File tree

2 files changed

+21
-21
lines changed

2 files changed

+21
-21
lines changed

Memory/RemoteProcess.cs

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ public T ReadRemoteObject<T>(IntPtr address) where T : struct
175175
{
176176
var data = ReadRemoteMemory(address, Marshal.SizeOf<T>());
177177

178-
var handle = GCHandle.Alloc(data, GCHandleType.Pinned);
179-
var obj = (T)Marshal.PtrToStructure(handle.AddrOfPinnedObject(), typeof(T));
180-
handle.Free();
178+
var gcHandle = GCHandle.Alloc(data, GCHandleType.Pinned);
179+
var obj = (T)Marshal.PtrToStructure(gcHandle.AddrOfPinnedObject(), typeof(T));
180+
gcHandle.Free();
181181

182182
return obj;
183183
}
@@ -423,9 +423,9 @@ public bool WriteRemoteMemory<T>(IntPtr address, T value) where T : struct
423423
{
424424
var data = new byte[Marshal.SizeOf<T>()];
425425

426-
var handle = GCHandle.Alloc(data, GCHandleType.Pinned);
427-
Marshal.StructureToPtr(value, handle.AddrOfPinnedObject(), false);
428-
handle.Free();
426+
var gcHandle = GCHandle.Alloc(data, GCHandleType.Pinned);
427+
Marshal.StructureToPtr(value, gcHandle.AddrOfPinnedObject(), false);
428+
gcHandle.Free();
429429

430430
return WriteRemoteMemory(address, data);
431431
}

UI/MemoryViewControl.cs

Lines changed: 15 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -362,18 +362,18 @@ protected override void OnMouseClick(MouseEventArgs e)
362362

363363
EventHandler handler = (sender2, e2) =>
364364
{
365-
var classNode = (sender2 as TypeToolStripMenuItem)?.Tag as ClassNode;
366-
if (classNode == null)
365+
var selectedClassNode = (sender2 as TypeToolStripMenuItem)?.Tag as ClassNode;
366+
if (selectedClassNode == null)
367367
{
368368
return;
369369
}
370370

371-
if (classNode == noneClass)
371+
if (selectedClassNode == noneClass)
372372
{
373-
classNode = null;
373+
selectedClassNode = null;
374374
}
375375

376-
functionNode.BelongsToClass = classNode;
376+
functionNode.BelongsToClass = selectedClassNode;
377377
};
378378

379379
items = noneClass.Yield()
@@ -395,15 +395,15 @@ protected override void OnMouseClick(MouseEventArgs e)
395395
{
396396
EventHandler handler = (sender2, e2) =>
397397
{
398-
var classNode = (sender2 as TypeToolStripMenuItem)?.Tag as ClassNode;
399-
if (classNode == null)
398+
var selectedClassNode = (sender2 as TypeToolStripMenuItem)?.Tag as ClassNode;
399+
if (selectedClassNode == null)
400400
{
401401
return;
402402
}
403403

404-
if (IsCycleFree(refNode.ParentNode as ClassNode, classNode))
404+
if (IsCycleFree(refNode.ParentNode as ClassNode, selectedClassNode))
405405
{
406-
refNode.ChangeInnerNode(classNode);
406+
refNode.ChangeInnerNode(selectedClassNode);
407407
}
408408
};
409409

@@ -775,11 +775,11 @@ private void createClassFromNodesToolStripMenuItem_Click(object sender, EventArg
775775
var parentNode = selectedNodes[0].Node.ParentNode as ClassNode;
776776
if (parentNode != null)
777777
{
778-
var classNode = ClassNode.Create();
779-
selectedNodes.Select(h => h.Node).ForEach(classNode.AddNode);
778+
var newClassNode = ClassNode.Create();
779+
selectedNodes.Select(h => h.Node).ForEach(newClassNode.AddNode);
780780

781781
var classInstanceNode = new ClassInstanceNode();
782-
classInstanceNode.ChangeInnerNode(classNode);
782+
classInstanceNode.ChangeInnerNode(newClassNode);
783783

784784
parentNode.InsertNode(selectedNodes[0].Node, classInstanceNode);
785785

@@ -1035,11 +1035,11 @@ private void CopySelectedNodesToClipboard()
10351035
private void PasteNodeFromClipboardToSelection()
10361036
{
10371037
var result = ReClassClipboard.Paste(project, Program.Logger);
1038-
foreach (var classNode in result.Item1)
1038+
foreach (var pastedClassNode in result.Item1)
10391039
{
1040-
if (!project.ContainsClass(classNode.Uuid))
1040+
if (!project.ContainsClass(pastedClassNode.Uuid))
10411041
{
1042-
project.AddClass(classNode);
1042+
project.AddClass(pastedClassNode);
10431043
}
10441044
}
10451045

0 commit comments

Comments
 (0)