diff --git a/trunk/ProcessHacker.Common/Objects/BaseObject.cs b/trunk/ProcessHacker.Common/Objects/BaseObject.cs
index ce7d6c330..cad883eef 100644
--- a/trunk/ProcessHacker.Common/Objects/BaseObject.cs
+++ b/trunk/ProcessHacker.Common/Objects/BaseObject.cs
@@ -50,7 +50,7 @@ namespace ProcessHacker.Common.Objects
/// the object will be freed.
///
///
- public abstract class BaseObject : IDisposable, IReferenceCountedObject
+ public abstract class BaseObject : IDisposable, IRefCounted
{
private static int _createdCount = 0;
private static int _freedCount = 0;
diff --git a/trunk/ProcessHacker.Common/Objects/HandleTable.cs b/trunk/ProcessHacker.Common/Objects/HandleTable.cs
index 49acc5dfe..5f6f1cc64 100644
--- a/trunk/ProcessHacker.Common/Objects/HandleTable.cs
+++ b/trunk/ProcessHacker.Common/Objects/HandleTable.cs
@@ -27,7 +27,7 @@ namespace ProcessHacker.Common.Objects
public class HandleTableEntry
{
private int _handle;
- private IReferenceCountedObject _object;
+ private IRefCounted _object;
public int Handle
{
@@ -35,7 +35,7 @@ namespace ProcessHacker.Common.Objects
internal set { _handle = value; }
}
- public IReferenceCountedObject Object
+ public IRefCounted Object
{
get { return _object; }
internal set { _object = value; }
@@ -81,7 +81,7 @@ namespace ProcessHacker.Common.Objects
///
/// The object to reference.
/// The new handle.
- public int Allocate(IReferenceCountedObject obj)
+ public int Allocate(IRefCounted obj)
{
TEntry entry = new TEntry();
@@ -94,7 +94,7 @@ namespace ProcessHacker.Common.Objects
/// The object to reference.
/// The handle table entry to use.
/// The new handle.
- public int Allocate(IReferenceCountedObject obj, TEntry entry)
+ public int Allocate(IRefCounted obj, TEntry entry)
{
int handle = _handleGenerator.Pop();
@@ -142,7 +142,7 @@ namespace ProcessHacker.Common.Objects
/// Whether the handle was closed.
public bool Free(int handle)
{
- IReferenceCountedObject obj;
+ IRefCounted obj;
lock (_handles)
{
@@ -187,7 +187,7 @@ namespace ProcessHacker.Common.Objects
/// An object. This object has not been referenced and is
/// not guaranteed to be valid.
///
- public IReferenceCountedObject LookupObject(int handle)
+ public IRefCounted LookupObject(int handle)
{
return this.LookupEntry(handle).Object;
}
@@ -202,7 +202,7 @@ namespace ProcessHacker.Common.Objects
/// not guaranteed to be valid.
///
public T LookupObject(int handle)
- where T : class, IReferenceCountedObject
+ where T : class, IRefCounted
{
return this.LookupObject(handle) as T;
}
@@ -215,7 +215,7 @@ namespace ProcessHacker.Common.Objects
/// An object. This object has been referenced and must be
/// dereferenced once it is no longer needed.
///
- public IReferenceCountedObject ReferenceByHandle(int handle)
+ public IRefCounted ReferenceByHandle(int handle)
{
TEntry entry;
return this.ReferenceByHandle(handle, out entry);
@@ -230,13 +230,13 @@ namespace ProcessHacker.Common.Objects
/// An object. This object has been referenced and must be
/// dereferenced once it is no longer needed.
///
- public IReferenceCountedObject ReferenceByHandle(int handle, out TEntry entry)
+ public IRefCounted ReferenceByHandle(int handle, out TEntry entry)
{
lock (_handles)
{
if (_handles.ContainsKey(handle))
{
- IReferenceCountedObject obj = _handles[handle].Object;
+ IRefCounted obj = _handles[handle].Object;
obj.Reference();
entry = _handles[handle];
@@ -261,7 +261,7 @@ namespace ProcessHacker.Common.Objects
/// dereferenced once it is no longer needed.
///
public T ReferenceByHandle(int handle)
- where T : class, IReferenceCountedObject
+ where T : class, IRefCounted
{
TEntry entry;
return this.ReferenceByHandle(handle, out entry);
@@ -278,9 +278,9 @@ namespace ProcessHacker.Common.Objects
/// dereferenced once it is no longer needed.
///
public T ReferenceByHandle(int handle, out TEntry entry)
- where T : class, IReferenceCountedObject
+ where T : class, IRefCounted
{
- IReferenceCountedObject obj = this.ReferenceByHandle(handle, out entry);
+ IRefCounted obj = this.ReferenceByHandle(handle, out entry);
if (obj == null)
return null;
diff --git a/trunk/ProcessHacker.Common/Objects/IReferenceCountedObject.cs b/trunk/ProcessHacker.Common/Objects/IRefCounted.cs
similarity index 94%
rename from trunk/ProcessHacker.Common/Objects/IReferenceCountedObject.cs
rename to trunk/ProcessHacker.Common/Objects/IRefCounted.cs
index ad696b26b..cbb37b004 100644
--- a/trunk/ProcessHacker.Common/Objects/IReferenceCountedObject.cs
+++ b/trunk/ProcessHacker.Common/Objects/IRefCounted.cs
@@ -2,7 +2,7 @@
namespace ProcessHacker.Common.Objects
{
- public interface IReferenceCountedObject : IDisposable
+ public interface IRefCounted : IDisposable
{
///
/// Decrements the reference count of the object.
diff --git a/trunk/ProcessHacker.Common/Objects/SecuredHandleTable.cs b/trunk/ProcessHacker.Common/Objects/SecuredHandleTable.cs
index 8bd7534f3..77dd24b2c 100644
--- a/trunk/ProcessHacker.Common/Objects/SecuredHandleTable.cs
+++ b/trunk/ProcessHacker.Common/Objects/SecuredHandleTable.cs
@@ -77,7 +77,7 @@ namespace ProcessHacker.Common.Objects
/// The object to reference.
/// The granted access to the object.
/// The new handle.
- public int Allocate(IReferenceCountedObject obj, TAccess grantedAccess)
+ public int Allocate(IRefCounted obj, TAccess grantedAccess)
where TAccess : struct
{
TEntry entry = new TEntry();
@@ -97,7 +97,7 @@ namespace ProcessHacker.Common.Objects
/// An object. This object has been referenced and must be
/// dereferenced once it is no longer needed.
///
- public IReferenceCountedObject ReferenceByHandle(int handle, TAccess access)
+ public IRefCounted ReferenceByHandle(int handle, TAccess access)
where TAccess : struct
{
return this.ReferenceByHandle(handle, access, false);
@@ -116,11 +116,11 @@ namespace ProcessHacker.Common.Objects
/// An object. This object has been referenced and must be
/// dereferenced once it is no longer needed.
///
- public IReferenceCountedObject ReferenceByHandle(int handle, TAccess access, bool throwOnAccessDenied)
+ public IRefCounted ReferenceByHandle(int handle, TAccess access, bool throwOnAccessDenied)
where TAccess : struct
{
TEntry entry;
- IReferenceCountedObject obj;
+ IRefCounted obj;
// Reference the object.
obj = this.ReferenceByHandle(handle, out entry);
@@ -158,7 +158,7 @@ namespace ProcessHacker.Common.Objects
/// dereferenced once it is no longer needed.
///
public T ReferenceByHandle(int handle, TAccess access)
- where T : class, IReferenceCountedObject
+ where T : class, IRefCounted
where TAccess : struct
{
return this.ReferenceByHandle(handle, access, false);
@@ -179,10 +179,10 @@ namespace ProcessHacker.Common.Objects
/// dereferenced once it is no longer needed.
///
public T ReferenceByHandle(int handle, TAccess access, bool throwOnAccessDenied)
- where T : class, IReferenceCountedObject
+ where T : class, IRefCounted
where TAccess : struct
{
- IReferenceCountedObject obj = this.ReferenceByHandle(handle, access, throwOnAccessDenied);
+ IRefCounted obj = this.ReferenceByHandle(handle, access, throwOnAccessDenied);
if (obj == null)
return null;
diff --git a/trunk/ProcessHacker.Common/ProcessHacker.Common.csproj b/trunk/ProcessHacker.Common/ProcessHacker.Common.csproj
index cec91d41a..bd3cc680d 100644
--- a/trunk/ProcessHacker.Common/ProcessHacker.Common.csproj
+++ b/trunk/ProcessHacker.Common/ProcessHacker.Common.csproj
@@ -64,7 +64,7 @@
-
+