1.1 --- a/sourcehook/sourcehook.cpp Sun Aug 07 03:26:58 2005 +0000
1.2 +++ b/sourcehook/sourcehook.cpp Fri Aug 12 17:33:31 2005 +0000
1.3 @@ -14,7 +14,6 @@
1.4 * @brief Contains the implementation of the SourceHook API
1.5 */
1.6
1.7 -#include <algorithm>
1.8 #include "sourcehook_impl.h"
1.9
1.10 namespace SourceHook
1.11 @@ -58,7 +57,7 @@
1.12 for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.13 iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.14 {
1.15 - std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.16 + List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.17 TMP_CHECK_LIST(hooks_pre);
1.18 TMP_CHECK_LIST(hooks_post);
1.19 }
1.20 @@ -71,7 +70,7 @@
1.21 void CSourceHookImpl::UnloadPlugin(Plugin plug)
1.22 {
1.23 // 1) Manually remove all hooks by this plugin
1.24 - std::list<RemoveHookInfo> hookstoremove;
1.25 + List<RemoveHookInfo> hookstoremove;
1.26 HookManInfoList::iterator hmil_iter;
1.27
1.28 #define TMP_CHECK_LIST(name, ispost) \
1.29 @@ -87,7 +86,7 @@
1.30 for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.31 iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.32 {
1.33 - std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.34 + List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.35 TMP_CHECK_LIST(hooks_pre, false);
1.36 TMP_CHECK_LIST(hooks_post, true);
1.37 }
1.38 @@ -95,7 +94,7 @@
1.39 }
1.40 #undef TMP_CHECK_LIST
1.41
1.42 - for (std::list<RemoveHookInfo>::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter)
1.43 + for (List<RemoveHookInfo>::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter)
1.44 RemoveHook(*rmiter);
1.45
1.46 // 2) Other plugins may use hook managers in this plugin.
1.47 @@ -164,7 +163,7 @@
1.48
1.49 void CSourceHookImpl::CompleteShutdown()
1.50 {
1.51 - std::list<RemoveHookInfo> hookstoremove;
1.52 + List<RemoveHookInfo> hookstoremove;
1.53 #define TMP_CHECK_LIST(name, ispost) \
1.54 for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \
1.55 hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \
1.56 @@ -177,7 +176,7 @@
1.57 for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.58 iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter)
1.59 {
1.60 - std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.61 + List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hook_iter;
1.62 TMP_CHECK_LIST(hooks_pre, false);
1.63 TMP_CHECK_LIST(hooks_post, true);
1.64 }
1.65 @@ -185,7 +184,7 @@
1.66 }
1.67 #undef TMP_CHECK_LIST
1.68
1.69 - for (std::list<RemoveHookInfo>::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter)
1.70 + for (List<RemoveHookInfo>::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter)
1.71 RemoveHook(*rmiter);
1.72
1.73 m_HookMans.clear();
1.74 @@ -227,8 +226,7 @@
1.75 reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs);
1.76 void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.vtbl_idx);
1.77
1.78 - HookManagerInfo::VfnPtrListIter vfnptr_iter = std::find(
1.79 - hookman->vfnptrs.begin(), hookman->vfnptrs.end(), cur_vfnptr);
1.80 + HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.find(cur_vfnptr);
1.81
1.82 if (vfnptr_iter == hookman->vfnptrs.end())
1.83 {
1.84 @@ -253,8 +251,7 @@
1.85 ApplyCallClassPatches(adjustediface, tmp.vtbl_offs, tmp.vtbl_idx, vfp.orig_entry);
1.86 }
1.87
1.88 - HookManagerInfo::VfnPtr::IfaceListIter iface_iter = std::find(
1.89 - vfnptr_iter->ifaces.begin(), vfnptr_iter->ifaces.end(), adjustediface);
1.90 + HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.find(adjustediface);
1.91 if (iface_iter == vfnptr_iter->ifaces.end())
1.92 {
1.93 // Add a new one
1.94 @@ -311,18 +308,19 @@
1.95 reinterpret_cast<char*>(adjustediface) + tmp.vtbl_offs);
1.96 void *cur_vfnptr = reinterpret_cast<void*>(cur_vtptr + tmp.vtbl_idx);
1.97
1.98 - HookManagerInfo::VfnPtrListIter vfnptr_iter = std::find(hookman->vfnptrs.begin(), hookman->vfnptrs.end(), cur_vfnptr);
1.99 + HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.find(cur_vfnptr);
1.100 +
1.101 if (vfnptr_iter == hookman->vfnptrs.end())
1.102 return false;
1.103
1.104 for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin();
1.105 iface_iter != vfnptr_iter->ifaces.end();)
1.106 {
1.107 - std::list<HookManagerInfo::VfnPtr::Iface::Hook> &hooks =
1.108 + List<HookManagerInfo::VfnPtr::Iface::Hook> &hooks =
1.109 post ? iface_iter->hooks_post : iface_iter->hooks_pre;
1.110
1.111 bool erase;
1.112 - for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = hooks.begin();
1.113 + for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = hooks.begin();
1.114 hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
1.115 {
1.116 erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler) &&
1.117 @@ -386,7 +384,7 @@
1.118
1.119 void CSourceHookImpl::ReleaseCallClass(GenericCallClass *ptr)
1.120 {
1.121 - Impl_CallClassList::iterator iter = std::find(m_CallClasses.begin(), m_CallClasses.end(), ptr);
1.122 + Impl_CallClassList::iterator iter = m_CallClasses.find(ptr);
1.123 if (iter == m_CallClasses.end())
1.124 return;
1.125 --iter->refcounter;
1.126 @@ -495,12 +493,12 @@
1.127 for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin();
1.128 ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter)
1.129 {
1.130 - for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
1.131 + for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
1.132 hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
1.133 if (plug == hookiter->plug)
1.134 hookiter->paused = true;
1.135
1.136 - for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
1.137 + for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
1.138 hookiter != ifaceiter->hooks_post.end(); ++hookiter)
1.139 if (plug == hookiter->plug)
1.140 hookiter->paused = true;
1.141 @@ -516,12 +514,12 @@
1.142 for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin();
1.143 ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter)
1.144 {
1.145 - for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
1.146 + for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_pre.begin();
1.147 hookiter != ifaceiter->hooks_pre.end(); ++hookiter)
1.148 if (plug == hookiter->plug)
1.149 hookiter->paused = false;
1.150
1.151 - for (std::list<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
1.152 + for (List<HookManagerInfo::VfnPtr::Iface::Hook>::iterator hookiter = ifaceiter->hooks_post.begin();
1.153 hookiter != ifaceiter->hooks_post.end(); ++hookiter)
1.154 if (plug == hookiter->plug)
1.155 hookiter->paused = false;