diff -r beffdec7d04c -r e023f17b7b73 sourcehook/sourcehook.cpp --- a/sourcehook/sourcehook.cpp Sun Aug 07 03:26:58 2005 +0000 +++ b/sourcehook/sourcehook.cpp Fri Aug 12 17:33:31 2005 +0000 @@ -14,7 +14,6 @@ * @brief Contains the implementation of the SourceHook API */ -#include #include "sourcehook_impl.h" namespace SourceHook @@ -58,7 +57,7 @@ for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin(); iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter) { - std::list::iterator hook_iter; + List::iterator hook_iter; TMP_CHECK_LIST(hooks_pre); TMP_CHECK_LIST(hooks_post); } @@ -71,7 +70,7 @@ void CSourceHookImpl::UnloadPlugin(Plugin plug) { // 1) Manually remove all hooks by this plugin - std::list hookstoremove; + List hookstoremove; HookManInfoList::iterator hmil_iter; #define TMP_CHECK_LIST(name, ispost) \ @@ -87,7 +86,7 @@ for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin(); iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter) { - std::list::iterator hook_iter; + List::iterator hook_iter; TMP_CHECK_LIST(hooks_pre, false); TMP_CHECK_LIST(hooks_post, true); } @@ -95,7 +94,7 @@ } #undef TMP_CHECK_LIST - for (std::list::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter) + for (List::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter) RemoveHook(*rmiter); // 2) Other plugins may use hook managers in this plugin. @@ -164,7 +163,7 @@ void CSourceHookImpl::CompleteShutdown() { - std::list hookstoremove; + List hookstoremove; #define TMP_CHECK_LIST(name, ispost) \ for (hook_iter = iface_iter->name.begin(); hook_iter != iface_iter->name.end(); ++hook_iter) \ hookstoremove.push_back(RemoveHookInfo(hook_iter->plug, iface_iter->ptr, \ @@ -177,7 +176,7 @@ for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin(); iface_iter != vfnptr_iter->ifaces.end(); ++iface_iter) { - std::list::iterator hook_iter; + List::iterator hook_iter; TMP_CHECK_LIST(hooks_pre, false); TMP_CHECK_LIST(hooks_post, true); } @@ -185,7 +184,7 @@ } #undef TMP_CHECK_LIST - for (std::list::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter) + for (List::iterator rmiter = hookstoremove.begin(); rmiter != hookstoremove.end(); ++rmiter) RemoveHook(*rmiter); m_HookMans.clear(); @@ -227,8 +226,7 @@ reinterpret_cast(adjustediface) + tmp.vtbl_offs); void *cur_vfnptr = reinterpret_cast(cur_vtptr + tmp.vtbl_idx); - HookManagerInfo::VfnPtrListIter vfnptr_iter = std::find( - hookman->vfnptrs.begin(), hookman->vfnptrs.end(), cur_vfnptr); + HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.find(cur_vfnptr); if (vfnptr_iter == hookman->vfnptrs.end()) { @@ -253,8 +251,7 @@ ApplyCallClassPatches(adjustediface, tmp.vtbl_offs, tmp.vtbl_idx, vfp.orig_entry); } - HookManagerInfo::VfnPtr::IfaceListIter iface_iter = std::find( - vfnptr_iter->ifaces.begin(), vfnptr_iter->ifaces.end(), adjustediface); + HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.find(adjustediface); if (iface_iter == vfnptr_iter->ifaces.end()) { // Add a new one @@ -311,18 +308,19 @@ reinterpret_cast(adjustediface) + tmp.vtbl_offs); void *cur_vfnptr = reinterpret_cast(cur_vtptr + tmp.vtbl_idx); - HookManagerInfo::VfnPtrListIter vfnptr_iter = std::find(hookman->vfnptrs.begin(), hookman->vfnptrs.end(), cur_vfnptr); + HookManagerInfo::VfnPtrListIter vfnptr_iter = hookman->vfnptrs.find(cur_vfnptr); + if (vfnptr_iter == hookman->vfnptrs.end()) return false; for (HookManagerInfo::VfnPtr::IfaceListIter iface_iter = vfnptr_iter->ifaces.begin(); iface_iter != vfnptr_iter->ifaces.end();) { - std::list &hooks = + List &hooks = post ? iface_iter->hooks_post : iface_iter->hooks_pre; bool erase; - for (std::list::iterator hookiter = hooks.begin(); + for (List::iterator hookiter = hooks.begin(); hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter) { erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler) && @@ -386,7 +384,7 @@ void CSourceHookImpl::ReleaseCallClass(GenericCallClass *ptr) { - Impl_CallClassList::iterator iter = std::find(m_CallClasses.begin(), m_CallClasses.end(), ptr); + Impl_CallClassList::iterator iter = m_CallClasses.find(ptr); if (iter == m_CallClasses.end()) return; --iter->refcounter; @@ -495,12 +493,12 @@ for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin(); ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter) { - for (std::list::iterator hookiter = ifaceiter->hooks_pre.begin(); + for (List::iterator hookiter = ifaceiter->hooks_pre.begin(); hookiter != ifaceiter->hooks_pre.end(); ++hookiter) if (plug == hookiter->plug) hookiter->paused = true; - for (std::list::iterator hookiter = ifaceiter->hooks_post.begin(); + for (List::iterator hookiter = ifaceiter->hooks_post.begin(); hookiter != ifaceiter->hooks_post.end(); ++hookiter) if (plug == hookiter->plug) hookiter->paused = true; @@ -516,12 +514,12 @@ for (HookManagerInfo::VfnPtr::IfaceListIter ifaceiter = vfnptr_iter->ifaces.begin(); ifaceiter != vfnptr_iter->ifaces.end(); ++ifaceiter) { - for (std::list::iterator hookiter = ifaceiter->hooks_pre.begin(); + for (List::iterator hookiter = ifaceiter->hooks_pre.begin(); hookiter != ifaceiter->hooks_pre.end(); ++hookiter) if (plug == hookiter->plug) hookiter->paused = false; - for (std::list::iterator hookiter = ifaceiter->hooks_post.begin(); + for (List::iterator hookiter = ifaceiter->hooks_post.begin(); hookiter != ifaceiter->hooks_post.end(); ++hookiter) if (plug == hookiter->plug) hookiter->paused = false;