Cxbx-Reloaded/subhook
1
0
Fork 0
mirror of https://github.com/Cxbx-Reloaded/subhook.git synced 2024-12-02 08:08:32 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Make Install(src, dst, flags) remove existing hook

Browse Source
This commit is contained in:
Zeex 2020-05-30 19:59:20 +06:00
parent 873e7cd795
commit 2fe65f1de9
1 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
subhook.h
View File

@ -186,8 +186,13 @@ class Hook {
bool Install(void *src,
void *dst,
HookFlags flags = HookNoFlags) {
if (hook_ != nullptr) {
subhook_remove(hook_);
subhook_free(hook_);
}
hook_ = subhook_new(src, dst, (subhook_flags_t)flags);
if (hook_ == nullptr) {
hook_ = subhook_new(src, dst, (subhook_flags_t)flags);
return false;
}
return Install();
}
@ -211,8 +216,8 @@ class Hook {
class ScopedHookRemove {
public:
ScopedHookRemove(Hook *hook)
: hook_(hook)
, removed_(hook_->Remove())
: hook_(hook),
removed_(hook_->Remove())
{
}
@ -234,8 +239,8 @@ class ScopedHookRemove {
class ScopedHookInstall {
public:
ScopedHookInstall(Hook *hook)
: hook_(hook)
, installed_(hook_->Install())
: hook_(hook),
installed_(hook_->Install())
{
}
@ -243,8 +248,8 @@ class ScopedHookInstall {
void *src,
void *dst,
HookFlags flags = HookNoFlags)
: hook_(hook)
, installed_(hook_->Install(src, dst, flags))
: hook_(hook),
installed_(hook_->Install(src, dst, flags))
{
}