Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 2 additions & 1 deletion managed/CounterStrikeSharp.API/Core/API.cs
Original file line number Diff line number Diff line change
Expand Up @@ -1421,10 +1421,11 @@ public static void UnhookFunction(IntPtr function, InputArgument hook, bool post
}
}

public static T ExecuteVirtualFunction<T>(IntPtr function, object[] arguments){
public static T ExecuteVirtualFunction<T>(IntPtr function, bool bypass, object[] arguments){
lock (ScriptContext.GlobalScriptContext.Lock) {
ScriptContext.GlobalScriptContext.Reset();
ScriptContext.GlobalScriptContext.Push(function);
ScriptContext.GlobalScriptContext.Push(bypass);
foreach (var obj in arguments)
{
ScriptContext.GlobalScriptContext.Push(obj);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -67,13 +67,13 @@ public void Unhook(Func<DynamicHook, HookResult> handler, HookMode mode)
NativeAPI.UnhookFunction(Handle, handler, mode == HookMode.Post);
}

protected T InvokeInternal<T>(params object[] args)
protected T InvokeInternal<T>(bool bypass, params object[] args)
{
return NativeAPI.ExecuteVirtualFunction<T>(Handle, args);
return NativeAPI.ExecuteVirtualFunction<T>(Handle, bypass, args);
}

protected void InvokeInternalVoid(params object[] args)
protected void InvokeInternalVoid(bool bypass, params object[] args)
{
NativeAPI.ExecuteVirtualFunction<object>(Handle, args);
NativeAPI.ExecuteVirtualFunction<object>(Handle, bypass, args);
}
}
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke()
{
InvokeInternalVoid();
InvokeInternalVoid(false);
}

public void Invoke(bool bypasshook)
{
InvokeInternalVoid(bypasshook);
}
}

Expand All @@ -35,7 +40,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1)
{
InvokeInternalVoid(arg1);
InvokeInternalVoid(false, arg1);
}

public void Invoke(T1 arg1, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1);
}
}

Expand All @@ -53,7 +63,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2)
{
InvokeInternalVoid(arg1, arg2);
InvokeInternalVoid(false, arg1, arg2);
}

public void Invoke(T1 arg1, T2 arg2, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2);
}
}

Expand All @@ -71,7 +86,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3)
{
InvokeInternalVoid(arg1, arg2, arg3);
InvokeInternalVoid(false, arg1, arg2, arg3);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3);
}
}

Expand All @@ -97,7 +117,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
{
InvokeInternalVoid(arg1, arg2, arg3, arg4);
InvokeInternalVoid(false, arg1, arg2, arg3, arg4);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3, arg4);
}
}

Expand Down Expand Up @@ -125,7 +150,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
{
InvokeInternalVoid(arg1, arg2, arg3, arg4, arg5);
InvokeInternalVoid(false, arg1, arg2, arg3, arg4, arg5);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3, arg4, arg5);
}
}

Expand Down Expand Up @@ -153,7 +183,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
{
InvokeInternalVoid(arg1, arg2, arg3, arg4, arg5, arg6);
InvokeInternalVoid(false, arg1, arg2, arg3, arg4, arg5, arg6);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6);
}
}

Expand Down Expand Up @@ -183,7 +218,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
{
InvokeInternalVoid(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
InvokeInternalVoid(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}
}

Expand Down Expand Up @@ -213,7 +253,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
{
InvokeInternalVoid(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
InvokeInternalVoid(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
}
}

Expand Down Expand Up @@ -245,7 +290,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9)
{
InvokeInternalVoid(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
InvokeInternalVoid(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
}
}

Expand Down Expand Up @@ -277,7 +327,12 @@ public MemoryFunctionVoid(string signature, string binarypath) : base(signature,

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10)
{
InvokeInternalVoid(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
InvokeInternalVoid(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
}

public void Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, bool bypasshook)
{
InvokeInternalVoid(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
}
}

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke()
{
return InvokeInternal<TResult>();
return InvokeInternal<TResult>(false);
}

public TResult Invoke(bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook);
}
}

Expand All @@ -37,7 +42,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1)
{
return InvokeInternal<TResult>(arg1);
return InvokeInternal<TResult>(false, arg1);
}

public TResult Invoke(T1 arg1, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1);
}
}

Expand All @@ -55,7 +65,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2)
{
return InvokeInternal<TResult>(arg1, arg2);
return InvokeInternal<TResult>(false, arg1, arg2);
}

public TResult Invoke(T1 arg1, T2 arg2, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2);
}
}

Expand All @@ -73,7 +88,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3)
{
return InvokeInternal<TResult>(arg1, arg2, arg3);
return InvokeInternal<TResult>(false, arg1, arg2, arg3);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3);
}
}

Expand All @@ -99,7 +119,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4)
{
return InvokeInternal<TResult>(arg1, arg2, arg3, arg4);
return InvokeInternal<TResult>(false, arg1, arg2, arg3, arg4);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3, arg4);
}
}

Expand All @@ -125,7 +150,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5)
{
return InvokeInternal<TResult>(arg1, arg2, arg3, arg4, arg5);
return InvokeInternal<TResult>(false, arg1, arg2, arg3, arg4, arg5);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3, arg4, arg5);
}
}

Expand All @@ -151,7 +181,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6)
{
return InvokeInternal<TResult>(arg1, arg2, arg3, arg4, arg5, arg6);
return InvokeInternal<TResult>(false, arg1, arg2, arg3, arg4, arg5, arg6);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6);
}
}

Expand Down Expand Up @@ -179,7 +214,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7)
{
return InvokeInternal<TResult>(arg1, arg2, arg3, arg4, arg5, arg6, arg7);
return InvokeInternal<TResult>(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7);
}
}

Expand Down Expand Up @@ -207,7 +247,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8)
{
return InvokeInternal<TResult>(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
return InvokeInternal<TResult>(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8);
}
}

Expand Down Expand Up @@ -235,7 +280,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9)
{
return InvokeInternal<TResult>(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
return InvokeInternal<TResult>(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9);
}
}

Expand Down Expand Up @@ -265,7 +315,12 @@ public MemoryFunctionWithReturn(string signature, string binarypath) : base(sign

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10)
{
return InvokeInternal<TResult>(arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
return InvokeInternal<TResult>(false, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
}

public TResult Invoke(T1 arg1, T2 arg2, T3 arg3, T4 arg4, T5 arg5, T6 arg6, T7 arg7, T8 arg8, T9 arg9, T10 arg10, bool bypasshook)
{
return InvokeInternal<TResult>(bypasshook, arg1, arg2, arg3, arg4, arg5, arg6, arg7, arg8, arg9, arg10);
}
}

Expand Down
Loading
Loading