1.1 --- a/sourcehook/sourcehook.cpp Thu Sep 29 23:05:01 2005 +0000
1.2 +++ b/sourcehook/sourcehook.cpp Mon Oct 03 17:20:22 2005 +0000
1.3 @@ -17,8 +17,9 @@
1.4 #if defined __GNUC__
1.5 #include <stdint.h>
1.6 #endif
1.7 +
1.8 #include "sourcehook_impl.h"
1.9 -#include "sh_tinyhash.h"
1.10 +#include "sh_memory.h"
1.11
1.12 namespace SourceHook
1.13 {
1.14 @@ -41,7 +42,6 @@
1.15 CSourceHookImpl::CSourceHookImpl()
1.16 {
1.17 }
1.18 -
1.19 CSourceHookImpl::~CSourceHookImpl()
1.20 {
1.21 }
1.22 @@ -63,23 +63,23 @@
1.23 // If a hook from an other plugin is found, return true
1.24 // Return false otherwise
1.25 #define TMP_CHECK_LIST(name) \
1.26 - for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
1.27 + for (hook_iter = iface_iter->name.m_List.begin(); hook_iter != iface_iter->name.m_List.end(); ++hook_iter) \
1.28 if (hook_iter->plug == plug) \
1.29 return true;
1.30
1.31 for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
1.32 {
1.33 - if (hmil_iter->plug != plug)
1.34 + if (hmil_iter->m_Plug != plug)
1.35 continue;
1.36 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
1.37 - vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter)
1.38 + for (CHookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->m_VfnPtrs.begin();
1.39 + vfnptr_iter != hmil_iter->m_VfnPtrs.end(); ++vfnptr_iter)
1.40 {
1.41 - for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.42 - iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.43 + for (CVfnPtr::IfaceListIter iface_iter = vfnptr_iter->m_Ifaces.begin();
1.44 + iface_iter != vfnptr_iter->m_Ifaces.end(); ++iface_iter)
1.45 {
1.46 - List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.47 - TMP_CHECK_LIST(hooks_pre);
1.48 - TMP_CHECK_LIST(hooks_post);
1.49 + List<HookInfo>::iterator hook_iter;
1.50 + TMP_CHECK_LIST(m_PreHooks);
1.51 + TMP_CHECK_LIST(m_PostHooks);
1.52 }
1.53 }
1.54 }
1.55 @@ -94,21 +94,22 @@
1.56 HookManInfoList::iterator hmil_iter;
1.57
1.58 #define TMP_CHECK_LIST(name, ispost) \
1.59 - for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
1.60 + for (hook_iter = iface_iter->name.m_List.begin(); hook_iter != iface_iter->name.m_List.end(); ++hook_iter) \
1.61 if (hook_iter->plug == plug) \
1.62 - hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
1.63 - hook_iter->thisptr_offs, hmil_iter->func, hook_iter->handler, ispost))
1.64 + hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->m_Ptr, \
1.65 + hook_iter->thisptr_offs, hmil_iter->m_Func, hook_iter->handler, ispost))
1.66 +
1.67 for (hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
1.68 {
1.69 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
1.70 - vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter)
1.71 + for (CHookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->m_VfnPtrs.begin();
1.72 + vfnptr_iter != hmil_iter->m_VfnPtrs.end(); ++vfnptr_iter)
1.73 {
1.74 - for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.75 - iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.76 + for (CVfnPtr::IfaceListIter iface_iter = vfnptr_iter->m_Ifaces.begin();
1.77 + iface_iter != vfnptr_iter->m_Ifaces.end(); ++iface_iter)
1.78 {
1.79 - List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.80 - TMP_CHECK_LIST(hooks_pre, false);
1.81 - TMP_CHECK_LIST(hooks_post, true);
1.82 + List<HookInfo>::iterator hook_iter;
1.83 + TMP_CHECK_LIST(m_PreHooks, false);
1.84 + TMP_CHECK_LIST(m_PostHooks, true);
1.85 }
1.86 }
1.87 }
1.88 @@ -126,9 +127,9 @@
1.89 for (hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end();
1.90 erase ? hmil_iter=m_HookMans.erase(hmil_iter) : ++hmil_iter)
1.91 {
1.92 - if (hmil_iter->plug == plug)
1.93 + if (hmil_iter->m_Plug == plug)
1.94 {
1.95 - if (!hmil_iter->vfnptrs.empty())
1.96 + if (!hmil_iter->m_VfnPtrs.empty())
1.97 {
1.98 // All hooks by this plugin are already removed
1.99 // So if there is a vfnptr, it has to be used by an other plugin
1.100 @@ -139,42 +140,42 @@
1.101 else
1.102 erase = false;
1.103 }
1.104 -
1.105 - // For each hook manager:
1.106 +
1.107 + // For each hook manager that is used in an other plugin:
1.108 for (hmil_iter = tmphookmans.begin(); hmil_iter != tmphookmans.end(); ++hmil_iter)
1.109 {
1.110 // Find a suitable hook manager in an other plugin
1.111 HookManInfoList::iterator newHookMan = FindHookMan(m_HookMans.begin(), m_HookMans.end(),
1.112 - hmil_iter->proto, hmil_iter->vtbl_offs, hmil_iter->vtbl_idx);
1.113 + hmil_iter->m_Proto, hmil_iter->m_VtblOffs, hmil_iter->m_VtblIdx);
1.114
1.115 // This should _never_ happen.
1.116 // If there is a hook from an other plugin, the plugin must have provided a hook manager as well.
1.117 SH_ASSERT(newHookMan != m_HookMans.end(),
1.118 - "Could not find a suitable hook manager in an other plugin!");
1.119 + ("Could not find a suitable hook manager in an other plugin!"));
1.120
1.121 // AddHook should make sure that every plugin only has _one_ hook manager for _one_ proto/vi/vo
1.122 - SH_ASSERT(newHookMan->plug != plug, "New hook manager from same plugin!");
1.123 + SH_ASSERT(newHookMan->m_Plug != plug, ("New hook manager from same plugin!"));
1.124
1.125 // The first hook manager should be always used - so the new hook manager has to be empty
1.126 - SH_ASSERT(newHookMan->vfnptrs.empty(), "New hook manager not empty!");
1.127 + SH_ASSERT(newHookMan->m_VfnPtrs.empty(), ("New hook manager not empty!"));
1.128
1.129 // Move the vfnptrs from the old hook manager to the new one
1.130 - newHookMan->vfnptrs = hmil_iter->vfnptrs;
1.131 + newHookMan->m_VfnPtrs = hmil_iter->m_VfnPtrs;
1.132
1.133 // Unregister the old one, register the new one
1.134 - hmil_iter->func(HA_Unregister, NULL);
1.135 - newHookMan->func(HA_Register, &(*newHookMan));
1.136 + hmil_iter->m_Func(HA_Unregister, NULL);
1.137 + newHookMan->m_Func(HA_Register, &(*newHookMan));
1.138
1.139 // zOMG BAIL, here is part of what you wanted:
1.140
1.141 // Go through all vfnptrs in this hookman and patch them to point to the new manager's handler!
1.142 // or whatever
1.143 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = newHookMan->vfnptrs.begin();
1.144 - vfnptr_iter != newHookMan->vfnptrs.end(); ++vfnptr_iter)
1.145 + for (CHookManagerInfo::VfnPtrListIter vfnptr_iter = newHookMan->m_VfnPtrs.begin();
1.146 + vfnptr_iter != newHookMan->m_VfnPtrs.end(); ++vfnptr_iter)
1.147 {
1.148 - // And DEREFERENCE newHookMan->hookfunc_vfnptr!
1.149 + // And DEREFERENCE newHookMan->m_HookfuncVfnptr!
1.150 // otherwise it will be executing the vtable... had to find out the hard way
1.151 - *reinterpret_cast<void**>(vfnptr_iter->vfnptr) = *reinterpret_cast<void**>(newHookMan->hookfunc_vfnptr);
1.152 + *reinterpret_cast<void**>(vfnptr_iter->m_Ptr) = *reinterpret_cast<void**>(newHookMan->m_HookfuncVfnptr);
1.153 }
1.154
1.155 // That should fix it, bail!
1.156 @@ -185,20 +186,20 @@
1.157 {
1.158 List<RemoveHookInfo> hookstoremove;
1.159 #define TMP_CHECK_LIST(name, ispost) \
1.160 - for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
1.161 - hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
1.162 - hook_iter->thisptr_offs, hmil_iter->func, hook_iter->handler, ispost))
1.163 + for (hook_iter = iface_iter->name.m_List.begin(); hook_iter != iface_iter->name.m_List.end(); ++hook_iter) \
1.164 + hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->m_Ptr, \
1.165 + hook_iter->thisptr_offs, hmil_iter->m_Func, hook_iter->handler, ispost))
1.166 for (HookManInfoList::iterator hmil_iter = m_HookMans.begin(); hmil_iter != m_HookMans.end(); ++hmil_iter)
1.167 {
1.168 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->vfnptrs.begin();
1.169 - vfnptr_iter != hmil_iter->vfnptrs.end(); ++vfnptr_iter)
1.170 + for (CHookManagerInfo::VfnPtrListIter vfnptr_iter = hmil_iter->m_VfnPtrs.begin();
1.171 + vfnptr_iter != hmil_iter->m_VfnPtrs.end(); ++vfnptr_iter)
1.172 {
1.173 - for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.174 - iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.175 + for (CVfnPtr::IfaceListIter iface_iter = vfnptr_iter->m_Ifaces.begin();
1.176 + iface_iter != vfnptr_iter->m_Ifaces.end(); ++iface_iter)
1.177 {
1.178 - List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.179 - TMP_CHECK_LIST(hooks_pre, false);
1.180 - TMP_CHECK_LIST(hooks_post, true);
1.181 + List<HookInfo>::iterator hook_iter;
1.182 + TMP_CHECK_LIST(m_PreHooks, false);
1.183 + TMP_CHECK_LIST(m_PostHooks, true);
1.184 }
1.185 }
1.186 }
1.187 @@ -214,87 +215,84 @@
1.188 {
1.189 void *adjustediface = reinterpret_cast<void*>(reinterpret_cast<char*>(iface) + thisptr_offs);
1.190 // 1) Get info about the hook manager
1.191 - HookManagerInfo tmp;
1.192 + CHookManagerInfo tmp;
1.193 if (myHookMan(HA_GetInfo, &tmp) != 0)
1.194 return false;
1.195
1.196 - // Add the proposed hook manager to the _end_ of the list if the plugin doesn't have a hook manager with this proto/vo/vi registered
1.197 + // Add the proposed hook manager to the _end_ of the list if the plugin doesn't have a hook manager
1.198 + // with this proto/vo/vi registered
1.199 HookManInfoList::iterator hkmi_iter;
1.200 for (hkmi_iter = m_HookMans.begin(); hkmi_iter != m_HookMans.end(); ++hkmi_iter)
1.201 {
1.202 - if (hkmi_iter->plug == plug && strcmp(hkmi_iter->proto, tmp.proto) == 0 &&
1.203 - hkmi_iter->vtbl_offs == tmp.vtbl_offs && hkmi_iter->vtbl_idx == tmp.vtbl_idx)
1.204 + if (hkmi_iter->m_Plug == plug && strcmp(hkmi_iter->m_Proto, tmp.m_Proto) == 0 &&
1.205 + hkmi_iter->m_VtblOffs == tmp.m_VtblOffs && hkmi_iter->m_VtblIdx == tmp.m_VtblIdx)
1.206 break;
1.207 }
1.208 if (hkmi_iter == m_HookMans.end())
1.209 {
1.210 // No such hook manager from this plugin yet, add it!
1.211 - tmp.func = myHookMan;
1.212 - tmp.plug = plug;
1.213 + tmp.m_Func = myHookMan;
1.214 + tmp.m_Plug = plug;
1.215 m_HookMans.push_back(tmp);
1.216 }
1.217
1.218 // Then, search for a suitable hook manager (from the beginning)
1.219 - HookManInfoList::iterator hookman = FindHookMan(m_HookMans.begin(), m_HookMans.end(), tmp.proto, tmp.vtbl_offs, tmp.vtbl_idx);
1.220 - SH_ASSERT(hookman != m_HookMans.end(), "No hookman found - but if there was none, we've just added one!");
1.221 + HookManInfoList::iterator hookman = FindHookMan(m_HookMans.begin(), m_HookMans.end(), tmp.m_Proto,
1.222 + tmp.m_VtblOffs, tmp.m_VtblIdx);
1.223 + SH_ASSERT(hookman != m_HookMans.end(), ("No hookman found - but if there was none, we've just added one!"));
1.224
1.225 // Tell it to store the pointer if it's not already active
1.226 - if (hookman->vfnptrs.empty())
1.227 - hookman->func(HA_Register, &(*hookman));
1.228 + if (hookman->m_VfnPtrs.empty())
1.229 + hookman->m_Func(HA_Register, &(*hookman));
1.230
1.231 void **cur_vtptr = *reinterpret_cast<void***>(
1.232 - reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs);
1.233 - void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.vtbl_idx);
1.234 + reinterpret_cast<char*>(adjustediface) + tmp.m_VtblOffs);
1.235 + void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.m_VtblIdx);
1.236
1.237 - HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.find(cur_vfnptr);
1.238 + CHookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->m_VfnPtrs.find(cur_vfnptr);
1.239
1.240 - if (vfnptr_iter == hookman->vfnptrs.end())
1.241 + if (vfnptr_iter == hookman->m_VfnPtrs.end())
1.242 {
1.243 // Add a new one
1.244 - HookManagerInfo::VfnPtr vfp;
1.245 - vfp.vfnptr = cur_vfnptr;
1.246 - vfp.orig_entry = *reinterpret_cast<void**>(cur_vfnptr);
1.247 + CVfnPtr vfp(cur_vfnptr);
1.248
1.249 // Alter vtable entry
1.250 - if (!SetMemAccess(cur_vtptr, sizeof(void*) * (tmp.vtbl_idx + 1), SH_MEM_READ | SH_MEM_WRITE))
1.251 + if (!SetMemAccess(cur_vtptr, sizeof(void*) * (tmp.m_VtblIdx + 1), SH_MEM_READ | SH_MEM_WRITE))
1.252 return false;
1.253 -
1.254 - *reinterpret_cast<void**>(cur_vfnptr) = *reinterpret_cast<void**>(hookman->hookfunc_vfnptr);
1.255 +
1.256 + *reinterpret_cast<void**>(cur_vfnptr) = *reinterpret_cast<void**>(hookman->m_HookfuncVfnptr);
1.257
1.258 - hookman->vfnptrs.push_back(vfp);
1.259 -
1.260 + hookman->m_VfnPtrs.push_back(vfp);
1.261 +
1.262 // Make vfnptr_iter point to the new element
1.263 - vfnptr_iter = hookman->vfnptrs.end();
1.264 + vfnptr_iter = hookman->m_VfnPtrs.end();
1.265 --vfnptr_iter;
1.266
1.267 // Now that it is done, check whether we have to update any callclasses
1.268 - ApplyCallClassPatches(adjustediface, tmp.vtbl_offs, tmp.vtbl_idx, vfp.orig_entry);
1.269 + ApplyCallClassPatches(adjustediface, tmp.m_VtblOffs, tmp.m_VtblIdx, vfp.m_OrigEntry);
1.270 }
1.271
1.272 - HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.find(adjustediface);
1.273 - if (iface_iter == vfnptr_iter->ifaces.end())
1.274 + CVfnPtr::IfaceListIter iface_iter = vfnptr_iter->m_Ifaces.find(adjustediface);
1.275 + if (iface_iter == vfnptr_iter->m_Ifaces.end())
1.276 {
1.277 // Add a new one
1.278 - HookManagerInfo::VfnPtr::Iface ifs;
1.279 - ifs.ptr = adjustediface;
1.280 - vfnptr_iter->ifaces.push_back(ifs);
1.281 + vfnptr_iter->m_Ifaces.push_back(CIface(adjustediface));
1.282
1.283 // Make iface_iter point to the new element
1.284 - iface_iter = vfnptr_iter->ifaces.end();
1.285 + iface_iter = vfnptr_iter->m_Ifaces.end();
1.286 --iface_iter;
1.287 }
1.288
1.289 // Add the hook
1.290 - HookManagerInfo::VfnPtr::Iface::Hook hookinfo;
1.291 + HookInfo hookinfo;
1.292 hookinfo.handler = handler;
1.293 hookinfo.plug = plug;
1.294 hookinfo.paused = false;
1.295 hookinfo.thisptr_offs = thisptr_offs;
1.296 if (post)
1.297 - iface_iter->hooks_post.push_back(hookinfo);
1.298 + iface_iter->m_PostHooks.m_List.push_back(hookinfo);
1.299 else
1.300 - iface_iter->hooks_pre.push_back(hookinfo);
1.301 -
1.302 + iface_iter->m_PreHooks.m_List.push_back(hookinfo);
1.303
1.304 return true;
1.305 }
1.306 @@ -307,40 +305,42 @@
1.307 bool CSourceHookImpl::RemoveHook(Plugin plug, void *iface, int thisptr_offs, HookManagerPubFunc myHookMan, ISHDelegate *handler, bool post)
1.308 {
1.309 void *adjustediface = reinterpret_cast<void*>(reinterpret_cast<char*>(iface)+thisptr_offs);
1.310 - HookManagerInfo tmp;
1.311 + CHookManagerInfo tmp;
1.312 if (myHookMan(HA_GetInfo, &tmp) != 0)
1.313 return false;
1.314
1.315 // Find the hook manager and the hook
1.316 - HookManInfoList::iterator hookman = FindHookMan(m_HookMans.begin(), m_HookMans.end(),
1.317 - tmp.proto, tmp.vtbl_offs, tmp.vtbl_idx);
1.318 + HookManInfoList::iterator hookman = FindHookMan(m_HookMans.begin(), m_HookMans.end(),
1.319 + tmp.m_Proto, tmp.m_VtblOffs, tmp.m_VtblIdx);
1.320 if (hookman == m_HookMans.end())
1.321 return false;
1.322
1.323 - if (IsBadReadPtr(reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs, sizeof(char)))
1.324 + if (!ModuleInMemory(reinterpret_cast<char*>(adjustediface) + tmp.m_VtblOffs,
1.325 + sizeof(void*) * (tmp.m_VtblIdx + 1)))
1.326 {
1.327 - hookman->vfnptrs.clear();
1.328 - hookman->func(HA_Unregister, NULL);
1.329 + // The module the vtable was in is already unloaded.
1.330 + hookman->m_VfnPtrs.clear();
1.331 + hookman->m_Func(HA_Unregister, NULL);
1.332 return true;
1.333 }
1.334
1.335 void **cur_vtptr = *reinterpret_cast<void***>(
1.336 - reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs);
1.337 - void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.vtbl_idx);
1.338 + reinterpret_cast<char*>(adjustediface) + tmp.m_VtblOffs);
1.339 + void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.m_VtblIdx);
1.340
1.341 - HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.find(cur_vfnptr);
1.342 + CHookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->m_VfnPtrs.find(cur_vfnptr);
1.343
1.344 - if (vfnptr_iter == hookman->vfnptrs.end())
1.345 + if (vfnptr_iter == hookman->m_VfnPtrs.end())
1.346 return false;
1.347
1.348 - for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.349 - iface_iter != vfnptr_iter->ifaces.end();)
1.350 + for (CVfnPtr::IfaceListIter iface_iter = vfnptr_iter->m_Ifaces.begin();
1.351 + iface_iter != vfnptr_iter->m_Ifaces.end();)
1.352 {
1.353 - List<HookManagerInfo::VfnPtr::Iface::Hook> &hooks =
1.354 - post ? iface_iter->hooks_post : iface_iter->hooks_pre;
1.355 + List<HookInfo> &hooks =
1.356 + post ? iface_iter->m_PostHooks.m_List : iface_iter->m_PreHooks.m_List;
1.357
1.358 bool erase;
1.359 - for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = hooks.begin();
1.360 + for (List<HookInfo>::iterator hookiter = hooks.begin();
1.361 hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
1.362 {
1.363 erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler) &&
1.364 @@ -348,25 +348,27 @@
1.365 if (erase)
1.366 hookiter->handler->DeleteThis(); // Make the _plugin_ delete the handler object
1.367 }
1.368 - if (iface_iter->hooks_post.empty() && iface_iter->hooks_pre.empty())
1.369 + if (iface_iter->m_PostHooks.m_List.empty() && iface_iter->m_PreHooks.m_List.empty())
1.370 {
1.371 - iface_iter = vfnptr_iter->ifaces.erase(iface_iter);
1.372 - if (vfnptr_iter->ifaces.empty())
1.373 + // There are no hooks on this iface anymore...
1.374 +
1.375 + iface_iter = vfnptr_iter->m_Ifaces.erase(iface_iter);
1.376 + if (vfnptr_iter->m_Ifaces.empty())
1.377 {
1.378 - // Deactivate the hook
1.379 - *reinterpret_cast<void**>(vfnptr_iter->vfnptr) = vfnptr_iter->orig_entry;
1.380 -
1.381 - hookman->vfnptrs.erase(vfnptr_iter);
1.382 + // No ifaces at all -> Deactivate the hook
1.383 + *reinterpret_cast<void**>(vfnptr_iter->m_Ptr) = vfnptr_iter->m_OrigEntry;
1.384 +
1.385 + hookman->m_VfnPtrs.erase(vfnptr_iter);
1.386
1.387 // Remove callclass patch
1.388 for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
1.389 - if (cciter->cc.ptr == adjustediface)
1.390 - RemoveCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx);
1.391 + if (cciter->m_Ptr == adjustediface)
1.392 + cciter->RemoveCallClassPatch(tmp.m_VtblOffs, tmp.m_VtblIdx);
1.393
1.394 - if (hookman->vfnptrs.empty())
1.395 + if (hookman->m_VfnPtrs.empty())
1.396 {
1.397 // Unregister the hook manager
1.398 - hookman->func(HA_Unregister, NULL);
1.399 + hookman->m_Func(HA_Unregister, NULL);
1.400 }
1.401
1.402 // Don't try to continue looping through ifaces
1.403 @@ -384,22 +386,19 @@
1.404 {
1.405 for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
1.406 {
1.407 - if (cciter->cc.ptr == iface && cciter->cc.objsize == size)
1.408 + if (cciter->m_Ptr == iface && cciter->m_ObjSize == size)
1.409 {
1.410 - ++cciter->refcounter;
1.411 - return &cciter->cc;
1.412 + ++cciter->m_RefCounter;
1.413 + return &(*cciter);
1.414 }
1.415 }
1.416
1.417 - CallClassInfo tmp;
1.418 - tmp.refcounter = 1;
1.419 - tmp.cc.ptr = iface;
1.420 - tmp.cc.objsize = size;
1.421 + // Make a new one
1.422
1.423 + CCallClassImpl tmp(iface, size);
1.424 ApplyCallClassPatches(tmp);
1.425 -
1.426 m_CallClasses.push_back(tmp);
1.427 - return &m_CallClasses.back().cc;
1.428 + return &m_CallClasses.back();
1.429 }
1.430
1.431 void CSourceHookImpl::ReleaseCallClass(GenericCallClass *ptr)
1.432 @@ -407,35 +406,27 @@
1.433 Impl_CallClassList::iterator iter = m_CallClasses.find(ptr);
1.434 if (iter == m_CallClasses.end())
1.435 return;
1.436 - --iter->refcounter;
1.437 - if (iter->refcounter < 1)
1.438 + --iter->m_RefCounter;
1.439 + if (iter->m_RefCounter < 1)
1.440 m_CallClasses.erase(iter);
1.441 }
1.442
1.443 - void CSourceHookImpl::ApplyCallClassPatch(CallClassInfo &cc, int vtbl_offs, int vtbl_idx, void *orig_entry)
1.444 - {
1.445 - OrigFuncs &tmpvec = cc.cc.vt[vtbl_offs];
1.446 - if (tmpvec.size() <= (size_t)vtbl_idx)
1.447 - tmpvec.resize(vtbl_idx+1);
1.448 - tmpvec[vtbl_idx] = orig_entry;
1.449 - }
1.450 -
1.451 - void CSourceHookImpl::ApplyCallClassPatches(CallClassInfo &cc)
1.452 + void CSourceHookImpl::ApplyCallClassPatches(CCallClassImpl &cc)
1.453 {
1.454 for (HookManInfoList::iterator hookman = m_HookMans.begin(); hookman != m_HookMans.end(); ++hookman)
1.455 {
1.456 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.begin();
1.457 - vfnptr_iter != hookman->vfnptrs.end(); ++vfnptr_iter)
1.458 + for (CHookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->m_VfnPtrs.begin();
1.459 + vfnptr_iter != hookman->m_VfnPtrs.end(); ++vfnptr_iter)
1.460 {
1.461 - for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.462 - iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.463 + for (CVfnPtr::IfaceListIter iface_iter = vfnptr_iter->m_Ifaces.begin();
1.464 + iface_iter != vfnptr_iter->m_Ifaces.end(); ++iface_iter)
1.465 {
1.466 - if (iface_iter->ptr >= cc.cc.ptr &&
1.467 - iface_iter->ptr < (reinterpret_cast<char*>(cc.cc.ptr) + cc.cc.objsize))
1.468 + if (iface_iter->m_Ptr >= cc.m_Ptr &&
1.469 + iface_iter->m_Ptr < (reinterpret_cast<char*>(cc.m_Ptr) + cc.m_ObjSize))
1.470 {
1.471 - ApplyCallClassPatch(cc, static_cast<int>(reinterpret_cast<char*>(iface_iter->ptr) -
1.472 - reinterpret_cast<char*>(cc.cc.ptr)) + hookman->vtbl_offs,
1.473 - hookman->vtbl_idx, vfnptr_iter->orig_entry);
1.474 + cc.ApplyCallClassPatch(static_cast<int>(reinterpret_cast<char*>(iface_iter->m_Ptr) -
1.475 + reinterpret_cast<char*>(cc.m_Ptr)) + hookman->m_VtblOffs,
1.476 + hookman->m_VtblIdx, vfnptr_iter->m_OrigEntry);
1.477 }
1.478 }
1.479 }
1.480 @@ -447,11 +438,11 @@
1.481 for (Impl_CallClassList::iterator cc_iter = m_CallClasses.begin(); cc_iter != m_CallClasses.end();
1.482 ++cc_iter)
1.483 {
1.484 - if (ifaceptr >= cc_iter->cc.ptr &&
1.485 - ifaceptr < (reinterpret_cast<char*>(cc_iter->cc.ptr) + cc_iter->cc.objsize))
1.486 + if (ifaceptr >= cc_iter->m_Ptr &&
1.487 + ifaceptr < (reinterpret_cast<char*>(cc_iter->m_Ptr) + cc_iter->m_ObjSize))
1.488 {
1.489 - ApplyCallClassPatch(*cc_iter, static_cast<int>(reinterpret_cast<char*>(ifaceptr) -
1.490 - reinterpret_cast<char*>(cc_iter->cc.ptr)) + vtbl_offs, vtbl_idx, orig_entry);
1.491 + cc_iter->ApplyCallClassPatch(static_cast<int>(reinterpret_cast<char*>(ifaceptr) -
1.492 + reinterpret_cast<char*>(cc_iter->m_Ptr)) + vtbl_offs, vtbl_idx, orig_entry);
1.493 }
1.494 }
1.495 }
1.496 @@ -461,34 +452,10 @@
1.497 for (Impl_CallClassList::iterator cc_iter = m_CallClasses.begin(); cc_iter != m_CallClasses.end();
1.498 ++cc_iter)
1.499 {
1.500 - if (ifaceptr >= cc_iter->cc.ptr &&
1.501 - ifaceptr < (reinterpret_cast<char*>(cc_iter->cc.ptr) + cc_iter->cc.objsize))
1.502 + if (ifaceptr >= cc_iter->m_Ptr &&
1.503 + ifaceptr < (reinterpret_cast<char*>(cc_iter->m_Ptr) + cc_iter->m_ObjSize))
1.504 {
1.505 - RemoveCallClassPatch(*cc_iter, vtbl_offs, vtbl_idx);
1.506 - }
1.507 - }
1.508 - }
1.509 -
1.510 - void CSourceHookImpl::RemoveCallClassPatch(CallClassInfo &cc, int vtbl_offs, int vtbl_idx)
1.511 - {
1.512 - OrigVTables::iterator iter = cc.cc.vt.find(vtbl_offs);
1.513 - if (iter != cc.cc.vt.end())
1.514 - {
1.515 - if (iter->val.size() > (size_t)vtbl_idx)
1.516 - {
1.517 - iter->val[vtbl_idx] = 0;
1.518 - // Free some memory if possible
1.519 - // :TODO: add this back in!
1.520 - /*
1.521 - OrigFuncs::reverse_iterator riter;
1.522 - for (riter = iter->second.rbegin(); riter != iter->second.rend(); ++riter)
1.523 - {
1.524 - if (*riter != 0)
1.525 - break;
1.526 - }
1.527 - iter->second.resize(iter->second.size() - (riter - iter->second.rbegin()));
1.528 - if (!iter->second.size())
1.529 - cc.cc.vt.erase(iter);*/
1.530 + cc_iter->RemoveCallClassPatch(vtbl_offs, vtbl_idx);
1.531 }
1.532 }
1.533 }
1.534 @@ -496,56 +463,44 @@
1.535 CSourceHookImpl::HookManInfoList::iterator CSourceHookImpl::FindHookMan(HookManInfoList::iterator begin,
1.536 HookManInfoList::iterator end, const char *proto, int vtblofs, int vtblidx)
1.537 {
1.538 - HookManInfoList::iterator hookmaniter;
1.539 + HookManInfoList::iterator hookmaniter;
1.540 for (hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
1.541 {
1.542 - if (strcmp(hookmaniter->proto, proto) == 0 && hookmaniter->vtbl_offs == vtblofs &&
1.543 - hookmaniter->vtbl_idx == vtblidx)
1.544 + if (strcmp(hookmaniter->m_Proto, proto) == 0 && hookmaniter->m_VtblOffs == vtblofs &&
1.545 + hookmaniter->m_VtblIdx == vtblidx)
1.546 break;
1.547 }
1.548 return hookmaniter;
1.549 }
1.550
1.551 - void CSourceHookImpl::PausePlugin(Plugin plug)
1.552 + void CSourceHookImpl::SetPluginPaused(Plugin plug, bool paused)
1.553 {
1.554 // Go through all hook managers, all interfaces, and set the status of all hooks of this plugin to paused
1.555 for (HookManInfoList::iterator hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
1.556 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookmaniter->vfnptrs.begin();
1.557 - vfnptr_iter != hookmaniter->vfnptrs.end(); ++vfnptr_iter)
1.558 - for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin();
1.559 - ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter)
1.560 + for (CHookManagerInfo::VfnPtrListIter vfnptr_iter = hookmaniter->m_VfnPtrs.begin();
1.561 + vfnptr_iter != hookmaniter->m_VfnPtrs.end(); ++vfnptr_iter)
1.562 + for (CVfnPtr::IfaceListIter ifaceiter = vfnptr_iter->m_Ifaces.begin();
1.563 + ifaceiter != vfnptr_iter->m_Ifaces.end(); ++ifaceiter)
1.564 {
1.565 - for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
1.566 - hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
1.567 + for (List<HookInfo>::iterator hookiter = ifaceiter->m_PreHooks.m_List.begin();
1.568 + hookiter != ifaceiter->m_PreHooks.m_List.end(); ++hookiter)
1.569 if (plug == hookiter->plug)
1.570 - hookiter->paused = true;
1.571 + hookiter->paused = paused;
1.572
1.573 - for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
1.574 - hookiter != ifaceiter->hooks_post.end(); ++hookiter)
1.575 + for (List<HookInfo>::iterator hookiter = ifaceiter->m_PostHooks.m_List.begin();
1.576 + hookiter != ifaceiter->m_PostHooks.m_List.end(); ++hookiter)
1.577 if (plug == hookiter->plug)
1.578 - hookiter->paused = true;
1.579 + hookiter->paused = paused;
1.580 }
1.581 }
1.582 + void CSourceHookImpl::PausePlugin(Plugin plug)
1.583 + {
1.584 + SetPluginPaused(plug, true);
1.585 + }
1.586
1.587 void CSourceHookImpl::UnpausePlugin(Plugin plug)
1.588 {
1.589 - // Go through all hook managers, all interfaces, and set the status of all hooks of this plugin to paused
1.590 - for (HookManInfoList::iterator hookmaniter = m_HookMans.begin(); hookmaniter != m_HookMans.end(); ++hookmaniter)
1.591 - for (HookManagerInfo::VfnPtrListIter vfnptr_iter = hookmaniter->vfnptrs.begin();
1.592 - vfnptr_iter != hookmaniter->vfnptrs.end(); ++vfnptr_iter)
1.593 - for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin();
1.594 - ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter)
1.595 - {
1.596 - for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
1.597 - hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
1.598 - if (plug == hookiter->plug)
1.599 - hookiter->paused = false;
1.600 -
1.601 - for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
1.602 - hookiter != ifaceiter->hooks_post.end(); ++hookiter)
1.603 - if (plug == hookiter->plug)
1.604 - hookiter->paused = false;
1.605 - }
1.606 + SetPluginPaused(plug, false);
1.607 }
1.608
1.609 void CSourceHookImpl::SetRes(META_RES res)
1.610 @@ -608,38 +563,212 @@
1.611 return m_IfacePtr;
1.612 }
1.613
1.614 -#ifdef __linux__
1.615 - bool g_BadReadCalled;
1.616 - jmp_buf g_BadReadJmpBuf;
1.617 + ////////////////////////////
1.618 + // CCallClassImpl
1.619 + ////////////////////////////
1.620 + CSourceHookImpl::CCallClassImpl::CCallClassImpl(void *ptr, size_t size)
1.621 + : m_Ptr(ptr), m_ObjSize(size), m_RefCounter(1)
1.622 + {
1.623 + }
1.624 + CSourceHookImpl::CCallClassImpl::~CCallClassImpl()
1.625 + {
1.626 + }
1.627
1.628 - // Windows has an implementation for this already, but Linux does not :(
1.629 - bool IsBadReadPtr(const void *ptr, size_t len)
1.630 + void *CSourceHookImpl::CCallClassImpl::GetThisPtr()
1.631 + {
1.632 + return m_Ptr;
1.633 + }
1.634 + void *CSourceHookImpl::CCallClassImpl::GetOrigFunc(int vtbloffs, int vtblidx)
1.635 {
1.636 - void(*prevHandler)(int sig);
1.637 - g_BadReadCalled = true;
1.638 + OrigVTables::iterator iter = m_VT.find(vtbloffs);
1.639 + if (iter != m_VT.end() && iter->val.size() > (size_t)vtblidx)
1.640 + {
1.641 + return iter->val[vtblidx];
1.642 + }
1.643 + return NULL;
1.644 + }
1.645
1.646 - if (setjmp(g_BadReadJmpBuf))
1.647 - return true;
1.648 + void CSourceHookImpl::CCallClassImpl::ApplyCallClassPatch(int vtbl_offs, int vtbl_idx, void *orig_entry)
1.649 + {
1.650 + OrigFuncs &tmpvec = m_VT[vtbl_offs];
1.651 + if (tmpvec.size() <= (size_t)vtbl_idx)
1.652 + tmpvec.resize(vtbl_idx+1);
1.653 + tmpvec[vtbl_idx] = orig_entry;
1.654 + }
1.655 + void CSourceHookImpl::CCallClassImpl::RemoveCallClassPatch(int vtbl_offs, int vtbl_idx)
1.656 + {
1.657 + OrigVTables::iterator iter = m_VT.find(vtbl_offs);
1.658 + if (iter != m_VT.end())
1.659 + {
1.660 + if (iter->val.size() > (size_t)vtbl_idx)
1.661 + {
1.662 + iter->val[vtbl_idx] = 0;
1.663
1.664 - prevHandler = signal(SIGSEGV, BadReadHandler);
1.665 + OrigFuncs &of = iter->val;
1.666 + OrigFuncs::iterator lastused = of.end();
1.667 + for (OrigFuncs::iterator viter = of.begin(); viter != of.end(); ++viter)
1.668 + {
1.669 + if (*viter)
1.670 + lastused = viter;
1.671 + }
1.672 + if (lastused == of.end())
1.673 + {
1.674 + // No used element => Remove the whole vector
1.675 + m_VT.erase(iter);
1.676 + return;
1.677 + }
1.678 + of.resize(lastused - of.begin() + 1);
1.679 + }
1.680 + }
1.681 + }
1.682
1.683 - volatile const char *p = reinterpret_cast<const char*>(ptr);
1.684 - char dummy;
1.685 + ////////////////////////////
1.686 + // CHookManagerInfo
1.687 + ////////////////////////////
1.688 + CSourceHookImpl::CHookManagerInfo::~CHookManagerInfo()
1.689 + {
1.690 + }
1.691
1.692 - for (size_t i = 0; i < len; i++)
1.693 - dummy = p[i];
1.694 + IVfnPtr *CSourceHookImpl::CHookManagerInfo::FindVfnPtr(void *vfnptr)
1.695 + {
1.696 + VfnPtrListIter iter = m_VfnPtrs.find(vfnptr);
1.697 + return iter == m_VfnPtrs.end() ? NULL : &(*iter);
1.698 + }
1.699 + void CSourceHookImpl::CHookManagerInfo::SetInfo(int vtbl_offs, int vtbl_idx, const char *proto)
1.700 + {
1.701 + m_VtblOffs = vtbl_offs;
1.702 + m_VtblIdx = vtbl_idx;
1.703 + m_Proto = proto;
1.704 + }
1.705 + void CSourceHookImpl::CHookManagerInfo::SetHookfuncVfnptr(void *hookfunc_vfnptr)
1.706 + {
1.707 + m_HookfuncVfnptr = hookfunc_vfnptr;
1.708 + }
1.709
1.710 - g_BadReadCalled = false;
1.711 + ////////////////////////////
1.712 + // CVfnPtr
1.713 + ////////////////////////////
1.714 +
1.715
1.716 - signal(SIGSEGV, prevHandler);
1.717 + CSourceHookImpl::CVfnPtr::CVfnPtr(void *ptr) : m_Ptr(ptr), m_OrigEntry(*reinterpret_cast<void**>(ptr))
1.718 + {
1.719 + }
1.720 + CSourceHookImpl::CVfnPtr::~CVfnPtr()
1.721 + {
1.722 + }
1.723
1.724 - return false;
1.725 + void *CSourceHookImpl::CVfnPtr::GetVfnPtr()
1.726 + {
1.727 + return m_Ptr;
1.728 + }
1.729 +
1.730 + void *CSourceHookImpl::CVfnPtr::GetOrigEntry()
1.731 + {
1.732 + return m_OrigEntry;
1.733 }
1.734
1.735 - void BadReadHandler(int sig)
1.736 + IIface *CSourceHookImpl::CVfnPtr::FindIface(void *ptr)
1.737 + {
1.738 + IfaceListIter iter = m_Ifaces.find(ptr);
1.739 + return iter == m_Ifaces.end() ? NULL : &(*iter);
1.740 + }
1.741 +
1.742 + ////////////////////////////
1.743 + // CIface
1.744 + ////////////////////////////
1.745 + CSourceHookImpl::CIface::CIface(void *ptr) : m_Ptr(ptr)
1.746 + {
1.747 + }
1.748 + CSourceHookImpl::CIface::~CIface()
1.749 + {
1.750 + }
1.751 +
1.752 + void *CSourceHookImpl::CIface::GetPtr()
1.753 + {
1.754 + return m_Ptr;
1.755 + }
1.756 +
1.757 + IHookList *CSourceHookImpl::CIface::GetPreHooks()
1.758 + {
1.759 + return &m_PreHooks;
1.760 + }
1.761 + IHookList *CSourceHookImpl::CIface::GetPostHooks()
1.762 + {
1.763 + return &m_PostHooks;
1.764 + }
1.765 +
1.766 + ////////////////////////////
1.767 + // CHookList
1.768 + ////////////////////////////
1.769 +
1.770 + CSourceHookImpl::CHookList::CHookList() : m_FreeIters(NULL)
1.771 + {
1.772 + }
1.773 + CSourceHookImpl::CHookList::CHookList(const CHookList &other) : m_List(other.m_List), m_FreeIters(NULL)
1.774 + {
1.775 + }
1.776 + CSourceHookImpl::CHookList::~CHookList()
1.777 + {
1.778 + while (m_FreeIters)
1.779 + {
1.780 + CIter *iter = m_FreeIters->m_pNext;
1.781 + delete m_FreeIters;
1.782 + m_FreeIters = iter;
1.783 + }
1.784 + }
1.785 + IHookList::IIter *CSourceHookImpl::CHookList::GetIter()
1.786 {
1.787 - if (g_BadReadCalled)
1.788 - longjmp(g_BadReadJmpBuf, 1);
1.789 + if (m_FreeIters)
1.790 + {
1.791 + CIter *ret = m_FreeIters;
1.792 + m_FreeIters = ret->m_pNext;
1.793 + ret->GoToBegin();
1.794 + return ret;
1.795 + }
1.796 + return new CIter(this);
1.797 + }
1.798 + void CSourceHookImpl::CHookList::ReleaseIter(IIter *pIter)
1.799 + {
1.800 + CIter *pIter2 = static_cast<CIter*>(pIter);
1.801 + pIter2->m_pNext = m_FreeIters;
1.802 + m_FreeIters = pIter2;
1.803 + }
1.804 +
1.805 + CSourceHookImpl::CHookList::CIter::CIter(CHookList *pList) : m_pList(pList), m_pNext(NULL)
1.806 + {
1.807 + GoToBegin();
1.808 + }
1.809 + CSourceHookImpl::CHookList::CIter::~CIter()
1.810 + {
1.811 }
1.812 -#endif
1.813 +
1.814 + void CSourceHookImpl::CHookList::CIter::GoToBegin()
1.815 + {
1.816 + m_Iter = m_pList->m_List.begin();
1.817 + SkipPaused();
1.818 + }
1.819 +
1.820 + bool CSourceHookImpl::CHookList::CIter::End()
1.821 + {
1.822 + return m_Iter == m_pList->m_List.end();
1.823 + }
1.824 + void CSourceHookImpl::CHookList::CIter::Next()
1.825 + {
1.826 + ++m_Iter;
1.827 + SkipPaused();
1.828 + }
1.829 + void CSourceHookImpl::CHookList::CIter::SkipPaused()
1.830 + {
1.831 + while (m_Iter != m_pList->m_List.end() && m_Iter->paused)
1.832 + ++m_Iter;
1.833 + }
1.834 +
1.835 + ISHDelegate *CSourceHookImpl::CHookList::CIter::Handler()
1.836 + {
1.837 + return m_Iter->handler;
1.838 + }
1.839 + int CSourceHookImpl::CHookList::CIter::ThisPtrOffs()
1.840 + {
1.841 + return m_Iter->thisptr_offs;
1.842 + }
1.843 }