1.1 --- a/sourcehook/sourcehook.cpp Wed May 04 13:59:57 2005 +0000
1.2 +++ b/sourcehook/sourcehook.cpp Thu May 05 10:40:47 2005 +0000
1.3 @@ -26,6 +26,16 @@
1.4 {
1.5 }
1.6
1.7 + int CSourceHookImpl::GetIfaceVersion()
1.8 + {
1.9 + return SH_IFACE_VERSION;
1.10 + }
1.11 +
1.12 + int CSourceHookImpl::GetImplVersion()
1.13 + {
1.14 + return SH_IMPL_VERSION;
1.15 + }
1.16 +
1.17 bool CSourceHookImpl::IsPluginInUse(Plugin plug)
1.18 {
1.19 // Iterate through all hook managers which are in this plugin
1.20 @@ -65,7 +75,7 @@
1.21 for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
1.22 if (hook_iter->plug == plug) \
1.23 hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
1.24 - hmil_iter->func, hook_iter->handler, ispost))
1.25 + hook_iter->thisptr_offs, hmil_iter->func, hook_iter->handler, ispost))
1.26 for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
1.27 {
1.28 for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
1.29 @@ -141,7 +151,7 @@
1.30 #define TMP_CHECK_LIST(name, ispost) \
1.31 for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
1.32 hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
1.33 - hmil_iter->func, hook_iter->handler, ispost))
1.34 + hook_iter->thisptr_offs, hmil_iter->func, hook_iter->handler, ispost))
1.35 for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
1.36 {
1.37 for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
1.38 @@ -223,9 +233,7 @@
1.39 --vfnptr_iter;
1.40
1.41 // Now that it is done, check whether we have to update any callclasses
1.42 - for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
1.43 - if (cciter->cc.ptr == iface)
1.44 - ApplyCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx, vfnptr_iter->orig_entry);
1.45 + ApplyCallClassPatches(adjustediface, tmp.vtbl_offs, tmp.vtbl_idx, vfp.orig_entry);
1.46 }
1.47
1.48 HookManagerInfo::VfnPtr::IfaceListIter iface_iter = std::find(
1.49 @@ -247,6 +255,7 @@
1.50 hookinfo.handler = handler;
1.51 hookinfo.plug = plug;
1.52 hookinfo.paused = false;
1.53 + hookinfo.thisptr_offs = thisptr_offs;
1.54 if (post)
1.55 iface_iter->hooks_post.push_back(hookinfo);
1.56 else
1.57 @@ -258,17 +267,12 @@
1.58
1.59 bool CSourceHookImpl::RemoveHook(RemoveHookInfo info)
1.60 {
1.61 - return RemoveHook(info.plug, info.iface, info.hookman, info.handler, info.post);
1.62 + return RemoveHook(info.plug, info.iface, info.thisptr_offs, info.hookman, info.handler, info.post);
1.63 }
1.64
1.65 bool CSourceHookImpl::RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
1.66 {
1.67 - return RemoveHook(plug, reinterpret_cast<void*>(reinterpret_cast<char*>(iface)+thisptr_offs),
1.68 - myHookMan, handler, post);
1.69 - }
1.70 -
1.71 - bool CSourceHookImpl::RemoveHook(Plugin plug, void *adjustediface, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
1.72 - {
1.73 + void *adjustediface = reinterpret_cast<void*>(reinterpret_cast<char*>(iface)+thisptr_offs);
1.74 HookManagerInfo tmp;
1.75 if (myHookMan(HA_GetInfo, &tmp) != 0)
1.76 return false;
1.77 @@ -297,7 +301,8 @@
1.78 for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = hooks.begin();
1.79 hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
1.80 {
1.81 - erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler);
1.82 + erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler) &&
1.83 + hookiter->thisptr_offs == thisptr_offs;
1.84 if (erase)
1.85 hookiter->handler->DeleteThis(); // Make the _plugin_ delete the handler object
1.86 }
1.87 @@ -333,11 +338,11 @@
1.88 return true;
1.89 }
1.90
1.91 - GenericCallClass *CSourceHookImpl::GetCallClass(void *iface)
1.92 + GenericCallClass *CSourceHookImpl::GetCallClass(void *iface, size_t size)
1.93 {
1.94 for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
1.95 {
1.96 - if (cciter->cc.ptr == iface)
1.97 + if (cciter->cc.ptr == iface && cciter->cc.objsize == size)
1.98 {
1.99 ++cciter->refcounter;
1.100 return &cciter->cc;
1.101 @@ -347,15 +352,9 @@
1.102 CallClassInfo tmp;
1.103 tmp.refcounter = 1;
1.104 tmp.cc.ptr = iface;
1.105 + tmp.cc.objsize = size;
1.106
1.107 - for (HookManInfoList::iterator hookman = m_HookMans.begin(); hookman != m_HookMans.end(); ++hookman)
1.108 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.begin();
1.109 - vfnptr_iter != hookman->vfnptrs.end(); ++vfnptr_iter)
1.110 - for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.111 - iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.112 - if (iface_iter->ptr == iface)
1.113 - ApplyCallClassPatch(tmp, hookman->vtbl_offs, hookman->vtbl_idx,
1.114 - vfnptr_iter->orig_entry);
1.115 + ApplyCallClassPatches(tmp);
1.116
1.117 m_CallClasses.push_back(tmp);
1.118 return &m_CallClasses.back().cc;
1.119 @@ -379,6 +378,55 @@
1.120 tmpvec[vtbl_idx] = orig_entry;
1.121 }
1.122
1.123 + void CSourceHookImpl::ApplyCallClassPatches(CallClassInfo &cc)
1.124 + {
1.125 + for (HookManInfoList::iterator hookman = m_HookMans.begin(); hookman != m_HookMans.end(); ++hookman)
1.126 + {
1.127 + for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.begin();
1.128 + vfnptr_iter != hookman->vfnptrs.end(); ++vfnptr_iter)
1.129 + {
1.130 + for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.131 + iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.132 + {
1.133 + if (iface_iter->ptr >= cc.cc.ptr &&
1.134 + iface_iter->ptr < (reinterpret_cast<char*>(cc.cc.ptr) + cc.cc.objsize))
1.135 + {
1.136 + ApplyCallClassPatch(cc, static_cast<int>(reinterpret_cast<char*>(iface_iter->ptr) -
1.137 + reinterpret_cast<char*>(cc.cc.ptr)) + hookman->vtbl_offs,
1.138 + hookman->vtbl_idx, vfnptr_iter->orig_entry);
1.139 + }
1.140 + }
1.141 + }
1.142 + }
1.143 + }
1.144 +
1.145 + void CSourceHookImpl::ApplyCallClassPatches(void *ifaceptr, int vtbl_offs, int vtbl_idx, void *orig_entry)
1.146 + {
1.147 + for (Impl_CallClassList::iterator cc_iter = m_CallClasses.begin(); cc_iter != m_CallClasses.end();
1.148 + ++cc_iter)
1.149 + {
1.150 + if (ifaceptr >= cc_iter->cc.ptr &&
1.151 + ifaceptr < (reinterpret_cast<char*>(cc_iter->cc.ptr) + cc_iter->cc.objsize))
1.152 + {
1.153 + ApplyCallClassPatch(*cc_iter, static_cast<int>(reinterpret_cast<char*>(ifaceptr) -
1.154 + reinterpret_cast<char*>(cc_iter->cc.ptr)) + vtbl_offs, vtbl_idx, orig_entry);
1.155 + }
1.156 + }
1.157 + }
1.158 +
1.159 + void CSourceHookImpl::RemoveCallClassPatches(void *ifaceptr, int vtbl_offs, int vtbl_idx)
1.160 + {
1.161 + for (Impl_CallClassList::iterator cc_iter = m_CallClasses.begin(); cc_iter != m_CallClasses.end();
1.162 + ++cc_iter)
1.163 + {
1.164 + if (ifaceptr >= cc_iter->cc.ptr &&
1.165 + ifaceptr < (reinterpret_cast<char*>(cc_iter->cc.ptr) + cc_iter->cc.objsize))
1.166 + {
1.167 + RemoveCallClassPatch(*cc_iter, vtbl_offs, vtbl_idx);
1.168 + }
1.169 + }
1.170 + }
1.171 +
1.172 void CSourceHookImpl::RemoveCallClassPatch(CallClassInfo &cc, int vtbl_offs, int vtbl_idx)
1.173 {
1.174 OrigVTables::iterator iter = cc.cc.vt.find(vtbl_offs);
1.175 @@ -496,6 +544,11 @@
1.176 return m_Status;
1.177 }
1.178
1.179 + void * &CSourceHookImpl::GetIfacePtrRef()
1.180 + {
1.181 + return m_IfacePtr;
1.182 + }
1.183 +
1.184 void CSourceHookImpl::SetOrigRet(const void *ptr)
1.185 {
1.186 m_OrigRet = ptr;
1.187 @@ -506,10 +559,6 @@
1.188 m_OverrideRet = ptr;
1.189 }
1.190
1.191 - void CSourceHookImpl::SetIfacePtr(void *ptr)
1.192 - {
1.193 - m_IfacePtr = ptr;
1.194 - }
1.195 void *CSourceHookImpl::GetIfacePtr()
1.196 {
1.197 return m_IfacePtr;