Skip to content

Commit a1311c5

Browse files
KN4CK3RKN4CK3R
committed
Changed the way how symbols get loaded because the COM objects used can't be created and used in different threads.
1 parent c1791e4 commit a1311c5

7 files changed

+285
-43
lines changed

‎Forms/MainForm.Designer.cs

Lines changed: 1 addition & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Forms/MainForm.cs

Lines changed: 31 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -141,19 +141,7 @@ private void selectProcessToolStripMenuItem_Click(object sender, EventArgs e)
141141
remoteProcess.UpdateProcessInformations();
142142
if (pb.LoadSymbols)
143143
{
144-
loadSymbolsTaskToken = new CancellationTokenSource();
145-
loadSymbolsTask = remoteProcess.LoadAllSymbolsAsync(m =>
146-
{
147-
Invoke((MethodInvoker)delegate ()
148-
{
149-
infoToolStripStatusLabel.Visible = true;
150-
infoToolStripStatusLabel.Text = $"Loading symbols for module: {m.Name}";
151-
});
152-
}, loadSymbolsTaskToken.Token)
153-
.ContinueWith(
154-
t => { infoToolStripStatusLabel.Visible = false; },
155-
TaskScheduler.FromCurrentSynchronizationContext()
156-
);
144+
LoadAllSymbolsForCurrentProcess();
157145
}
158146

159147
Program.Settings.LastProcess = remoteProcess.Process.Name;
@@ -323,6 +311,11 @@ private void loadSymbolToolStripMenuItem_Click(object sender, EventArgs e)
323311
}
324312
}
325313

314+
private void loadSymbolsToolStripMenuItem_Click(object sender, EventArgs e)
315+
{
316+
LoadAllSymbolsForCurrentProcess();
317+
}
318+
326319
private void cleanUnusedClassesToolStripMenuItem_Click(object sender, EventArgs e)
327320
{
328321
currentProject.RemoveUnusedClasses();
@@ -632,5 +625,30 @@ private void LoadFileFromPath(string filePath, ref ReClassNetProject project)
632625
import.Load(filePath, Program.Logger);
633626
}
634627
}
628+
629+
private void LoadAllSymbolsForCurrentProcess()
630+
{
631+
var progressDialog = new SymbolReaderProgressForm();
632+
progressDialog.Show(this);
633+
634+
Enabled = false;
635+
636+
int index = 0;
637+
remoteProcess.LoadAllSymbols((current, modules) =>
638+
{
639+
progressDialog.ProgressMaximum = modules.Count();
640+
progressDialog.ProgressValue = ++index;
641+
642+
progressDialog.ProgressText = $"[{progressDialog.ProgressValue}/{progressDialog.ProgressMaximum}] {current.Name}";
643+
644+
Application.DoEvents();
645+
646+
return true;
647+
});
648+
649+
Enabled = true;
650+
651+
progressDialog.Close();
652+
}
635653
}
636654
}

‎Forms/SymbolReaderProgressForm.Designer.cs

Lines changed: 75 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

‎Forms/SymbolReaderProgressForm.cs

Lines changed: 30 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,30 @@
1+
using System.Windows.Forms;
2+
3+
namespace ReClassNET.Forms
4+
{
5+
public partial class SymbolReaderProgressForm : Form
6+
{
7+
public int ProgressValue
8+
{
9+
get { return progressBar.Value; }
10+
set { progressBar.Value = value; }
11+
}
12+
13+
public int ProgressMaximum
14+
{
15+
get { return progressBar.Maximum; }
16+
set { progressBar.Maximum = value; }
17+
}
18+
19+
public string ProgressText
20+
{
21+
get { return label.Text; }
22+
set { label.Text = value; }
23+
}
24+
25+
public SymbolReaderProgressForm()
26+
{
27+
InitializeComponent();
28+
}
29+
}
30+
}

‎Forms/SymbolReaderProgressForm.resx

Lines changed: 120 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,120 @@
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<root>
3+
<!--
4+
Microsoft ResX Schema
5+
6+
Version 2.0
7+
8+
The primary goals of this format is to allow a simple XML format
9+
that is mostly human readable. The generation and parsing of the
10+
various data types are done through the TypeConverter classes
11+
associated with the data types.
12+
13+
Example:
14+
15+
... ado.net/XML headers & schema ...
16+
<resheader name="resmimetype">text/microsoft-resx</resheader>
17+
<resheader name="version">2.0</resheader>
18+
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
19+
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
20+
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
21+
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
22+
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
23+
<value>[base64 mime encoded serialized .NET Framework object]</value>
24+
</data>
25+
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
26+
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
27+
<comment>This is a comment</comment>
28+
</data>
29+
30+
There are any number of "resheader" rows that contain simple
31+
name/value pairs.
32+
33+
Each data row contains a name, and value. The row also contains a
34+
type or mimetype. Type corresponds to a .NET class that support
35+
text/value conversion through the TypeConverter architecture.
36+
Classes that don't support this are serialized and stored with the
37+
mimetype set.
38+
39+
The mimetype is used for serialized objects, and tells the
40+
ResXResourceReader how to depersist the object. This is currently not
41+
extensible. For a given mimetype the value must be set accordingly:
42+
43+
Note - application/x-microsoft.net.object.binary.base64 is the format
44+
that the ResXResourceWriter will generate, however the reader can
45+
read any of the formats listed below.
46+
47+
mimetype: application/x-microsoft.net.object.binary.base64
48+
value : The object must be serialized with
49+
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
50+
: and then encoded with base64 encoding.
51+
52+
mimetype: application/x-microsoft.net.object.soap.base64
53+
value : The object must be serialized with
54+
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
55+
: and then encoded with base64 encoding.
56+
57+
mimetype: application/x-microsoft.net.object.bytearray.base64
58+
value : The object must be serialized into a byte array
59+
: using a System.ComponentModel.TypeConverter
60+
: and then encoded with base64 encoding.
61+
-->
62+
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
63+
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
64+
<xsd:element name="root" msdata:IsDataSet="true">
65+
<xsd:complexType>
66+
<xsd:choice maxOccurs="unbounded">
67+
<xsd:element name="metadata">
68+
<xsd:complexType>
69+
<xsd:sequence>
70+
<xsd:element name="value" type="xsd:string" minOccurs="0" />
71+
</xsd:sequence>
72+
<xsd:attribute name="name" use="required" type="xsd:string" />
73+
<xsd:attribute name="type" type="xsd:string" />
74+
<xsd:attribute name="mimetype" type="xsd:string" />
75+
<xsd:attribute ref="xml:space" />
76+
</xsd:complexType>
77+
</xsd:element>
78+
<xsd:element name="assembly">
79+
<xsd:complexType>
80+
<xsd:attribute name="alias" type="xsd:string" />
81+
<xsd:attribute name="name" type="xsd:string" />
82+
</xsd:complexType>
83+
</xsd:element>
84+
<xsd:element name="data">
85+
<xsd:complexType>
86+
<xsd:sequence>
87+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
88+
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
89+
</xsd:sequence>
90+
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
91+
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
92+
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
93+
<xsd:attribute ref="xml:space" />
94+
</xsd:complexType>
95+
</xsd:element>
96+
<xsd:element name="resheader">
97+
<xsd:complexType>
98+
<xsd:sequence>
99+
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
100+
</xsd:sequence>
101+
<xsd:attribute name="name" type="xsd:string" use="required" />
102+
</xsd:complexType>
103+
</xsd:element>
104+
</xsd:choice>
105+
</xsd:complexType>
106+
</xsd:element>
107+
</xsd:schema>
108+
<resheader name="resmimetype">
109+
<value>text/microsoft-resx</value>
110+
</resheader>
111+
<resheader name="version">
112+
<value>2.0</value>
113+
</resheader>
114+
<resheader name="reader">
115+
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
116+
</resheader>
117+
<resheader name="writer">
118+
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
119+
</resheader>
120+
</root>

‎Memory/RemoteProcess.cs

Lines changed: 19 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,6 @@
55
using System.Linq;
66
using System.Runtime.InteropServices;
77
using System.Text;
8-
using System.Threading;
98
using System.Threading.Tasks;
109
using ReClassNET.AddressParser;
1110
using ReClassNET.SymbolReader;
@@ -528,45 +527,35 @@ public IntPtr ParseAddress(string addressFormula)
528527
return interpreter.Execute(operation, this);
529528
}
530529

531-
/// <summary>Loads all symbols for the process modules.</summary>
532-
public void LoadAllSymbols()
533-
{
534-
LoadAllSymbolsAsync(null, new CancellationToken()).Wait();
535-
}
536-
537530
/// <summary>A callback which gets called for every module while loading symbols.</summary>
538-
/// <param name="module">The current module.</param>
539-
public delegate void LoadModuleSymbols(Module module);
540-
541-
/// <summary>Loads all symbols asynchronous.</summary>
542-
/// <param name="callback">The callback is called for every module. The callback can be null.</param>
543-
/// <param name="token">The token used to cancel the task.</param>
544-
/// <returns>The task.</returns>
545-
public Task LoadAllSymbolsAsync(LoadModuleSymbols callback, CancellationToken token)
531+
/// <param name="current">The current module.</param>
532+
public delegate bool LoadModuleSymbols(Module current, IEnumerable<Module> allModules);
533+
534+
/// <summary>Loads symbols for all process modules.</summary>
535+
/// <param name="callback">The callback is called for every module.</param>
536+
public void LoadAllSymbols(LoadModuleSymbols callback)
546537
{
547538
var copy = modules.ToList();
548539

549-
return Task.Run(() =>
540+
foreach (var module in copy)
550541
{
551-
foreach (var module in copy)
542+
try
552543
{
553-
if (token.IsCancellationRequested)
544+
if (callback != null)
554545
{
555-
break;
546+
if (!callback(module, copy))
547+
{
548+
break;
549+
}
556550
}
557551

558-
try
559-
{
560-
callback?.Invoke(module);
561-
562-
Symbols.LoadSymbolsForModule(module);
563-
}
564-
catch
565-
{
566-
//ignore
567-
}
552+
Symbols.LoadSymbolsForModule(module);
553+
}
554+
catch (COMException)
555+
{
556+
// Ignore PDB not found errors.
568557
}
569-
}, token);
558+
}
570559
}
571560
}
572561
}

‎ReClass.NET.csproj

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -152,6 +152,12 @@
152152
<Compile Include="Forms\InputBytesForm.Designer.cs">
153153
<DependentUpon>InputBytesForm.cs</DependentUpon>
154154
</Compile>
155+
<Compile Include="Forms\SymbolReaderProgressForm.cs">
156+
<SubType>Form</SubType>
157+
</Compile>
158+
<Compile Include="Forms\SymbolReaderProgressForm.Designer.cs">
159+
<DependentUpon>SymbolReaderProgressForm.cs</DependentUpon>
160+
</Compile>
155161
<Compile Include="Memory\NodeDissector.cs" />
156162
<Compile Include="Memory\UnionDataType.cs" />
157163
<Compile Include="Nodes\ClassUtil.cs" />
@@ -351,6 +357,9 @@
351357
<EmbeddedResource Include="Forms\InputBytesForm.resx">
352358
<DependentUpon>InputBytesForm.cs</DependentUpon>
353359
</EmbeddedResource>
360+
<EmbeddedResource Include="Forms\SymbolReaderProgressForm.resx">
361+
<DependentUpon>SymbolReaderProgressForm.cs</DependentUpon>
362+
</EmbeddedResource>
354363
<EmbeddedResource Include="UI\ClassNodeView.resx">
355364
<DependentUpon>ClassNodeView.cs</DependentUpon>
356365
<SubType>Designer</SubType>

0 commit comments

Comments
 (0)