UNLOZE/sm-ext-dhooks2
10
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Cleanup detour structures properly on unload

Browse Source
This commit is contained in:
Peace-Maker 2016-12-11 22:18:53 -07:00
parent 2e52ab24b7
commit 63ccb7448f
3 changed files with 32 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
dynhooks_sourcepawn.cpp
View File

@ -150,6 +150,36 @@ void RemoveAllCallbacksForContext(IPluginContext *pContext)
RemoveAllCallbacksForContext(HOOKTYPE_POST, &g_pPostDetours, pContext);
}
void CleanupDetours(HookType_t hookType, DetourMap *map)
{
PluginCallbackList *wrappers;
CDynamicHooksSourcePawn *pWrapper;
DetourMap::iterator it = map->iter();
// Run through all active detours we added.
for (; !it.empty(); it.next())
{
wrappers = it->value;
// See if there are callbacks of this plugin context registered
// and remove them.
for (int i = wrappers->length() - 1; i >= 0; i--)
{
pWrapper = wrappers->at(i);
delete pWrapper;
}
// Unhook the function
delete wrappers;
UnhookFunction(hookType, it->key);
}
map->clear();
}
void CleanupDetours()
{
CleanupDetours(HOOKTYPE_PRE, &g_pPreDetours);
CleanupDetours(HOOKTYPE_POST, &g_pPostDetours);
}
ICallingConvention *ConstructCallingConvention(HookSetup *setup)
{
std::vector<DataTypeSized_t> vecArgTypes;

1
dynhooks_sourcepawn.h
View File

@ -37,5 +37,6 @@ bool HandleDetour(HookType_t hookType, CHook* pDetour);
bool AddDetourPluginHook(HookType_t hookType, CHook *pDetour, HookSetup *setup, IPluginFunction *pCallback);
bool RemoveDetourPluginHook(HookType_t hookType, CHook *pDetour, IPluginFunction *pCallback);
void RemoveAllCallbacksForContext(IPluginContext *pContext);
void CleanupDetours();
#endif

3
extension.cpp
View File

@ -89,8 +89,7 @@ void DHooks::SDK_OnAllLoaded()
void DHooks::SDK_OnUnload()
{
CleanupHooks();
// FIXME: Unhook only functions that are hooked by a plugin. + cleanup
GetHookManager()->UnhookAllFunctions();
CleanupDetours();
if(g_pEntityListener)
{
g_pEntityListener->CleanupListeners();