mirror of
https://github.com/mirror/processhacker
synced 2026-06-08 16:03:24 +00:00
* added event pair "properties"
* fixed event pair wait detection git-svn-id: svn://svn.code.sf.net/p/processhacker/code@1354 21ef857c-d57f-4fe0-8362-d861dc6d29cd
This commit is contained in:
@@ -8,6 +8,7 @@ Process Hacker
|
||||
Analyze > Wait to see what a thread is hanging on
|
||||
* More detailed handle properties
|
||||
* Event objects can now be modified - set, clear, pulse, reset
|
||||
* Event pair objects can now be modified - set high, set low
|
||||
* Semaphore objects can now be modified - acquire, release
|
||||
* FIXED:
|
||||
* #2795871 - "Hidden Processes window resizing problem"
|
||||
|
||||
@@ -74,6 +74,11 @@ namespace ProcessHacker.Native.Objects
|
||||
return new EventPairHandle(handle, true);
|
||||
}
|
||||
|
||||
public static EventPairHandle FromHandle(IntPtr handle)
|
||||
{
|
||||
return new EventPairHandle(handle, false);
|
||||
}
|
||||
|
||||
private EventPairHandle(IntPtr handle, bool owned)
|
||||
: base(handle, owned)
|
||||
{ }
|
||||
|
||||
@@ -0,0 +1,75 @@
|
||||
namespace ProcessHacker.Components
|
||||
{
|
||||
partial class EventPairProperties
|
||||
{
|
||||
/// <summary>
|
||||
/// Required designer variable.
|
||||
/// </summary>
|
||||
private System.ComponentModel.IContainer components = null;
|
||||
|
||||
/// <summary>
|
||||
/// Clean up any resources being used.
|
||||
/// </summary>
|
||||
/// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
|
||||
protected override void Dispose(bool disposing)
|
||||
{
|
||||
if (disposing && (components != null))
|
||||
{
|
||||
components.Dispose();
|
||||
}
|
||||
base.Dispose(disposing);
|
||||
}
|
||||
|
||||
#region Component Designer generated code
|
||||
|
||||
/// <summary>
|
||||
/// Required method for Designer support - do not modify
|
||||
/// the contents of this method with the code editor.
|
||||
/// </summary>
|
||||
private void InitializeComponent()
|
||||
{
|
||||
this.buttonSetHigh = new System.Windows.Forms.Button();
|
||||
this.buttonSetLow = new System.Windows.Forms.Button();
|
||||
this.SuspendLayout();
|
||||
//
|
||||
// buttonSetHigh
|
||||
//
|
||||
this.buttonSetHigh.FlatStyle = System.Windows.Forms.FlatStyle.System;
|
||||
this.buttonSetHigh.Location = new System.Drawing.Point(6, 6);
|
||||
this.buttonSetHigh.Name = "buttonSetHigh";
|
||||
this.buttonSetHigh.Size = new System.Drawing.Size(75, 23);
|
||||
this.buttonSetHigh.TabIndex = 0;
|
||||
this.buttonSetHigh.Text = "Set High";
|
||||
this.buttonSetHigh.UseVisualStyleBackColor = true;
|
||||
this.buttonSetHigh.Click += new System.EventHandler(this.buttonSetHigh_Click);
|
||||
//
|
||||
// buttonSetLow
|
||||
//
|
||||
this.buttonSetLow.FlatStyle = System.Windows.Forms.FlatStyle.System;
|
||||
this.buttonSetLow.Location = new System.Drawing.Point(87, 6);
|
||||
this.buttonSetLow.Name = "buttonSetLow";
|
||||
this.buttonSetLow.Size = new System.Drawing.Size(75, 23);
|
||||
this.buttonSetLow.TabIndex = 0;
|
||||
this.buttonSetLow.Text = "Set Low";
|
||||
this.buttonSetLow.UseVisualStyleBackColor = true;
|
||||
this.buttonSetLow.Click += new System.EventHandler(this.buttonSetLow_Click);
|
||||
//
|
||||
// EventPairProperties
|
||||
//
|
||||
this.AutoScaleDimensions = new System.Drawing.SizeF(6F, 13F);
|
||||
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
|
||||
this.Controls.Add(this.buttonSetLow);
|
||||
this.Controls.Add(this.buttonSetHigh);
|
||||
this.Name = "EventPairProperties";
|
||||
this.Padding = new System.Windows.Forms.Padding(3);
|
||||
this.Size = new System.Drawing.Size(212, 63);
|
||||
this.ResumeLayout(false);
|
||||
|
||||
}
|
||||
|
||||
#endregion
|
||||
|
||||
private System.Windows.Forms.Button buttonSetHigh;
|
||||
private System.Windows.Forms.Button buttonSetLow;
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,48 @@
|
||||
using System;
|
||||
using System.Collections.Generic;
|
||||
using System.ComponentModel;
|
||||
using System.Drawing;
|
||||
using System.Data;
|
||||
using System.Text;
|
||||
using System.Windows.Forms;
|
||||
using ProcessHacker.Native.Objects;
|
||||
using ProcessHacker.Native.Security;
|
||||
|
||||
namespace ProcessHacker.Components
|
||||
{
|
||||
public partial class EventPairProperties : UserControl
|
||||
{
|
||||
private EventPairHandle _eventPairHandle;
|
||||
|
||||
public EventPairProperties(EventPairHandle eventPairHandle)
|
||||
{
|
||||
InitializeComponent();
|
||||
|
||||
_eventPairHandle = eventPairHandle;
|
||||
}
|
||||
|
||||
private void buttonSetHigh_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
_eventPairHandle.SetHigh();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(ex.Message, "Process Hacker", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
|
||||
private void buttonSetLow_Click(object sender, EventArgs e)
|
||||
{
|
||||
try
|
||||
{
|
||||
_eventPairHandle.SetLow();
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
MessageBox.Show(ex.Message, "Process Hacker", MessageBoxButtons.OK, MessageBoxIcon.Error);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -0,0 +1,120 @@
|
||||
<?xml version="1.0" encoding="utf-8"?>
|
||||
<root>
|
||||
<!--
|
||||
Microsoft ResX Schema
|
||||
|
||||
Version 2.0
|
||||
|
||||
The primary goals of this format is to allow a simple XML format
|
||||
that is mostly human readable. The generation and parsing of the
|
||||
various data types are done through the TypeConverter classes
|
||||
associated with the data types.
|
||||
|
||||
Example:
|
||||
|
||||
... ado.net/XML headers & schema ...
|
||||
<resheader name="resmimetype">text/microsoft-resx</resheader>
|
||||
<resheader name="version">2.0</resheader>
|
||||
<resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
|
||||
<resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
|
||||
<data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
|
||||
<data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
|
||||
<data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
|
||||
<value>[base64 mime encoded serialized .NET Framework object]</value>
|
||||
</data>
|
||||
<data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
|
||||
<value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
|
||||
<comment>This is a comment</comment>
|
||||
</data>
|
||||
|
||||
There are any number of "resheader" rows that contain simple
|
||||
name/value pairs.
|
||||
|
||||
Each data row contains a name, and value. The row also contains a
|
||||
type or mimetype. Type corresponds to a .NET class that support
|
||||
text/value conversion through the TypeConverter architecture.
|
||||
Classes that don't support this are serialized and stored with the
|
||||
mimetype set.
|
||||
|
||||
The mimetype is used for serialized objects, and tells the
|
||||
ResXResourceReader how to depersist the object. This is currently not
|
||||
extensible. For a given mimetype the value must be set accordingly:
|
||||
|
||||
Note - application/x-microsoft.net.object.binary.base64 is the format
|
||||
that the ResXResourceWriter will generate, however the reader can
|
||||
read any of the formats listed below.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.binary.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.soap.base64
|
||||
value : The object must be serialized with
|
||||
: System.Runtime.Serialization.Formatters.Soap.SoapFormatter
|
||||
: and then encoded with base64 encoding.
|
||||
|
||||
mimetype: application/x-microsoft.net.object.bytearray.base64
|
||||
value : The object must be serialized into a byte array
|
||||
: using a System.ComponentModel.TypeConverter
|
||||
: and then encoded with base64 encoding.
|
||||
-->
|
||||
<xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
|
||||
<xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
|
||||
<xsd:element name="root" msdata:IsDataSet="true">
|
||||
<xsd:complexType>
|
||||
<xsd:choice maxOccurs="unbounded">
|
||||
<xsd:element name="metadata">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" use="required" type="xsd:string" />
|
||||
<xsd:attribute name="type" type="xsd:string" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="assembly">
|
||||
<xsd:complexType>
|
||||
<xsd:attribute name="alias" type="xsd:string" />
|
||||
<xsd:attribute name="name" type="xsd:string" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="data">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
<xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
|
||||
<xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
|
||||
<xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
|
||||
<xsd:attribute ref="xml:space" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
<xsd:element name="resheader">
|
||||
<xsd:complexType>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="name" type="xsd:string" use="required" />
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:choice>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
</xsd:schema>
|
||||
<resheader name="resmimetype">
|
||||
<value>text/microsoft-resx</value>
|
||||
</resheader>
|
||||
<resheader name="version">
|
||||
<value>2.0</value>
|
||||
</resheader>
|
||||
<resheader name="reader">
|
||||
<value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
<resheader name="writer">
|
||||
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
|
||||
</resheader>
|
||||
</root>
|
||||
@@ -421,6 +421,14 @@ namespace ProcessHacker.Components
|
||||
control.Controls.Add(eventProps);
|
||||
}
|
||||
break;
|
||||
case "eventpair":
|
||||
{
|
||||
dupHandle = new GenericHandle(phandle, handle, (int)EventPairAccess.All);
|
||||
var eventPairProps = new EventPairProperties(EventPairHandle.FromHandle(dupHandle));
|
||||
eventPairProps.Location = new Point(10, 20);
|
||||
control.Controls.Add(eventPairProps);
|
||||
}
|
||||
break;
|
||||
case "mutant":
|
||||
{
|
||||
dupHandle = new GenericHandle(phandle, handle, (int)MutantAccess.QueryState);
|
||||
|
||||
@@ -861,6 +861,8 @@ namespace ProcessHacker.Components
|
||||
|
||||
using (var thandle = new ThreadHandle(tid, ThreadAccess.GetContext | ThreadAccess.SuspendResume))
|
||||
{
|
||||
IntPtr[] lastParams = new IntPtr[4];
|
||||
|
||||
thandle.WalkStack(phandle, (stackFrame) =>
|
||||
{
|
||||
uint address = stackFrame.PcAddress.ToUInt32();
|
||||
@@ -974,6 +976,10 @@ namespace ProcessHacker.Components
|
||||
|
||||
IntPtr handle = stackFrame.Params[0];
|
||||
|
||||
// Use the KiFastSystemCallRet args if the handle we have is wrong.
|
||||
if (handle.ToInt32() % 2 != 0)
|
||||
handle = lastParams[1];
|
||||
|
||||
sb.AppendLine("Thread " + tid.ToString() + " is waiting (" + name + ") for an event pair:");
|
||||
|
||||
sb.AppendLine(this.GetHandleString(_pid, handle));
|
||||
@@ -1073,6 +1079,8 @@ namespace ProcessHacker.Components
|
||||
sb.AppendLine(this.GetHandleString(_pid, handle));
|
||||
}
|
||||
|
||||
lastParams = stackFrame.Params;
|
||||
|
||||
return !found;
|
||||
});
|
||||
}
|
||||
|
||||
@@ -125,6 +125,9 @@
|
||||
<DependentUpon>ColorModifier.cs</DependentUpon>
|
||||
<SubType>Designer</SubType>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Components\EventPairProperties.resx">
|
||||
<DependentUpon>EventPairProperties.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
<EmbeddedResource Include="Components\EventProperties.resx">
|
||||
<DependentUpon>EventProperties.cs</DependentUpon>
|
||||
</EmbeddedResource>
|
||||
@@ -348,6 +351,12 @@
|
||||
<None Include="Asm\AsmDefinitions.cs" />
|
||||
<Compile Include="Common\EnumComparer.cs" />
|
||||
<Compile Include="Common\WorkQueue.cs" />
|
||||
<Compile Include="Components\EventPairProperties.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
<Compile Include="Components\EventPairProperties.Designer.cs">
|
||||
<DependentUpon>EventPairProperties.cs</DependentUpon>
|
||||
</Compile>
|
||||
<Compile Include="Components\EventProperties.cs">
|
||||
<SubType>UserControl</SubType>
|
||||
</Compile>
|
||||
|
||||
Reference in New Issue
Block a user