ToxicMushroom/Dalamud
1
0
Fork 0
mirror of https://github.com/goatcorp/Dalamud.git synced 2025-12-12 10:17:22 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions 3

Do not throw ObjectDisposedException in IsEnabled and Disable (#2266)

Browse source
This commit is contained in:
Haselnussbomber 2025-05-09 23:10:35 +02:00 • committed by GitHub
parent bf491525f6
commit 2c735e9ec3
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 35 additions and 58 deletions
Download patch file Download diff file Expand all files Collapse all files

1
Dalamud/Hooking/Hook.cs
View file

@ -90,6 +90,7 @@ public abstract class Hook<T> : IDalamudHook where T : Delegate
/// <summary>
/// Starts intercepting a call to the function.
/// </summary>
/// <exception cref="ObjectDisposedException">Hook is already disposed.</exception>
public virtual void Enable() => throw new NotImplementedException();
/// <summary>

36
Dalamud/Hooking/Internal/FunctionPointerVariableHook.cs
View file

@ -115,14 +115,7 @@ internal class FunctionPointerVariableHook<T> : Hook<T>
}
/// <inheritdoc/>
public override bool IsEnabled
{
get
{
this.CheckDisposed();
return this.enabled;
}
}
public override bool IsEnabled => !this.IsDisposed && this.enabled;
/// <inheritdoc/>
public override string BackendName => "MinHook";
@ -131,9 +124,7 @@ internal class FunctionPointerVariableHook<T> : Hook<T>
public override void Dispose()
{
if (this.IsDisposed)
{
return;
}
this.Disable();
@ -148,15 +139,13 @@ internal class FunctionPointerVariableHook<T> : Hook<T>
/// <inheritdoc/>
public override void Enable()
{
this.CheckDisposed();
if (this.enabled)
{
return;
}
lock (HookManager.HookEnableSyncRoot)
{
this.CheckDisposed();
if (this.enabled)
return;
Marshal.WriteIntPtr(this.ppfnThunkJumpTarget, this.pfnDetour);
this.enabled = true;
}
@ -165,15 +154,14 @@ internal class FunctionPointerVariableHook<T> : Hook<T>
/// <inheritdoc/>
public override void Disable()
{
this.CheckDisposed();
if (!this.enabled)
{
return;
}
lock (HookManager.HookEnableSyncRoot)
{
if (this.IsDisposed)
return;
if (!this.enabled)
return;
Marshal.WriteIntPtr(this.ppfnThunkJumpTarget, this.pfnOriginal);
this.enabled = false;
}

38
Dalamud/Hooking/Internal/MinHookHook.cs
View file

@ -50,14 +50,7 @@ internal class MinHookHook<T> : Hook<T> where T : Delegate
}
/// <inheritdoc/>
public override bool IsEnabled
{
get
{
this.CheckDisposed();
return this.minHookImpl.Enabled;
}
}
public override bool IsEnabled => !this.IsDisposed && this.minHookImpl.Enabled;
/// <inheritdoc/>
public override string BackendName => "MinHook";
@ -84,28 +77,29 @@ internal class MinHookHook<T> : Hook<T> where T : Delegate
/// <inheritdoc/>
public override void Enable()
{
this.CheckDisposed();
if (!this.minHookImpl.Enabled)
lock (HookManager.HookEnableSyncRoot)
{
lock (HookManager.HookEnableSyncRoot)
{
this.minHookImpl.Enable();
}
this.CheckDisposed();
if (!this.minHookImpl.Enabled)
return;
this.minHookImpl.Enable();
}
}
/// <inheritdoc/>
public override void Disable()
{
this.CheckDisposed();
if (this.minHookImpl.Enabled)
lock (HookManager.HookEnableSyncRoot)
{
lock (HookManager.HookEnableSyncRoot)
{
this.minHookImpl.Disable();
}
if (this.IsDisposed)
return;
if (!this.minHookImpl.Enabled)
return;
this.minHookImpl.Disable();
}
}
}

18
Dalamud/Hooking/Internal/ReloadedHook.cs
View file

@ -45,14 +45,7 @@ internal class ReloadedHook<T> : Hook<T> where T : Delegate
}
/// <inheritdoc/>
public override bool IsEnabled
{
get
{
this.CheckDisposed();
return this.hookImpl.IsHookEnabled;
}
}
public override bool IsEnabled => !this.IsDisposed && this.hookImpl.IsHookEnabled;
/// <inheritdoc/>
public override string BackendName => "Reloaded";
@ -73,10 +66,10 @@ internal class ReloadedHook<T> : Hook<T> where T : Delegate
/// <inheritdoc/>
public override void Enable()
{
this.CheckDisposed();
lock (HookManager.HookEnableSyncRoot)
{
this.CheckDisposed();
if (!this.hookImpl.IsHookEnabled)
this.hookImpl.Enable();
}
@ -85,10 +78,11 @@ internal class ReloadedHook<T> : Hook<T> where T : Delegate
/// <inheritdoc/>
public override void Disable()
{
this.CheckDisposed();
lock (HookManager.HookEnableSyncRoot)
{
if (this.IsDisposed)
return;
if (!this.hookImpl.IsHookActivated)
return;