source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-08 02:48:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Truly gone fishing... It's fixed!

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%4084
This commit is contained in:
Pavol Marko 2005-07-02 10:09:40 +00:00
parent 5f6e613e01
commit f5076fa43d
1 changed files with 19 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
sourcehook/sourcehook.cpp
View File

@ -71,12 +71,14 @@ namespace SourceHook
{ {
// 1) Manually remove all hooks by this plugin // 1) Manually remove all hooks by this plugin
std::list<RemoveHookInfo> hookstoremove; std::list<RemoveHookInfo> hookstoremove;
HookManInfoList::iterator hmil_iter;
#define TMP_CHECK_LIST(name, ispost) \ #define TMP_CHECK_LIST(name, ispost) \
for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \ for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
if (hook_iter->plug == plug) \ if (hook_iter->plug == plug) \
hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \ hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
hook_iter->thisptr_offs, hmil_iter->func, hook_iter->handler, ispost)) hook_iter->thisptr_offs, hmil_iter->func, hook_iter->handler, ispost))
for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter) for (hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
{ {
for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin(); for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter) vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter)
@ -101,7 +103,7 @@ namespace SourceHook
HookManInfoList tmphookmans; HookManInfoList tmphookmans;
bool erase = false; bool erase = false;
for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); for (hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end();
erase ? hmil_iter=m_HookMans.erase(hmil_iter) : ++hmil_iter) erase ? hmil_iter=m_HookMans.erase(hmil_iter) : ++hmil_iter)
{ {
if (hmil_iter->plug == plug) if (hmil_iter->plug == plug)
@ -119,7 +121,7 @@ namespace SourceHook
} }
// For each hook manager: // For each hook manager:
for (HookManInfoList::iterator hmil_iter = tmphookmans.begin(); hmil_iter != tmphookmans.end(); ++hmil_iter) for (hmil_iter = tmphookmans.begin(); hmil_iter != tmphookmans.end(); ++hmil_iter)
{ {
// Find a suitable hook manager in an other plugin // Find a suitable hook manager in an other plugin
HookManInfoList::iterator newHookMan = FindHookMan(m_HookMans.begin(), m_HookMans.end(), HookManInfoList::iterator newHookMan = FindHookMan(m_HookMans.begin(), m_HookMans.end(),
@ -142,6 +144,20 @@ namespace SourceHook
// Unregister the old one, register the new one // Unregister the old one, register the new one
hmil_iter->func(HA_Unregister, NULL); hmil_iter->func(HA_Unregister, NULL);
newHookMan->func(HA_Register, &(*newHookMan)); newHookMan->func(HA_Register, &(*newHookMan));
// zOMG BAIL, here is part of what you wanted:
// Go through all vfnptrs in this hookman and patch them to point to the new manager's handler!
// or whatever
for (HookManagerInfo::VfnPtrListIter vfnptr_iter = newHookMan->vfnptrs.begin();
vfnptr_iter != newHookMan->vfnptrs.end(); ++vfnptr_iter)
{
// And DEREFERENCE newHookMan->hookfunc_vfnptr!
// otherwise it will be executing the vtable... had to find out the hard way
*reinterpret_cast<void**>(vfnptr_iter->vfnptr) = *reinterpret_cast<void**>(newHookMan->hookfunc_vfnptr);
}
// That should fix it, bail!
} }
} }