sourcehook/sourcehook.cpp
changeset 121 158b860440c0
parent 117 e322da4af2d2
child 123 53e819ac032a
     1.1 --- a/sourcehook/sourcehook.cpp	Mon Oct 03 18:37:35 2005 +0000
     1.2 +++ b/sourcehook/sourcehook.cpp	Wed Oct 05 21:51:02 2005 +0000
     1.3 @@ -341,12 +341,26 @@
     1.4  
     1.5  			bool erase;
     1.6  			for (List<HookInfo>::iterator hookiter = hooks.begin();
     1.7 -				hookiter != hooks.end(); erase ? hookiter = hooks.erase(hookiter) : ++hookiter)
     1.8 +				hookiter != hooks.end(); )
     1.9  			{
    1.10  				erase = hookiter->plug == plug && hookiter->handler->IsEqual(handler) &&
    1.11  					hookiter->thisptr_offs == thisptr_offs;
    1.12  				if (erase)
    1.13 +				{
    1.14  					hookiter->handler->DeleteThis();			// Make the _plugin_ delete the handler object
    1.15 +
    1.16 +					// Move all iterators pointing at this
    1.17 +					List<HookInfo>::iterator oldhookiter = hookiter;
    1.18 +					hookiter = hooks.erase(hookiter);
    1.19 +					List<HookInfo>::iterator newhookiter = hookiter;
    1.20 +					--newhookiter; // The hook loop will ++ it then
    1.21 +					CHookList::CIter *pItIter;
    1.22 +					for (pItIter = iface_iter->m_PreHooks.m_UsedIters; pItIter; pItIter = pItIter->m_pNext)
    1.23 +						if (pItIter->m_Iter == oldhookiter)
    1.24 +							pItIter->m_Iter = newhookiter;
    1.25 +				}
    1.26 +				else
    1.27 +					++hookiter;
    1.28  			}
    1.29  			if (iface_iter->m_PostHooks.m_List.empty() && iface_iter->m_PreHooks.m_List.empty())
    1.30  			{
    1.31 @@ -701,10 +715,10 @@
    1.32  	// CHookList
    1.33  	////////////////////////////
    1.34  
    1.35 -	CSourceHookImpl::CHookList::CHookList() : m_FreeIters(NULL)
    1.36 +	CSourceHookImpl::CHookList::CHookList() : m_FreeIters(NULL), m_UsedIters(NULL)
    1.37  	{
    1.38  	}
    1.39 -	CSourceHookImpl::CHookList::CHookList(const CHookList &other) : m_List(other.m_List), m_FreeIters(NULL)
    1.40 +	CSourceHookImpl::CHookList::CHookList(const CHookList &other) : m_List(other.m_List), m_FreeIters(NULL), m_UsedIters(NULL)
    1.41  	{
    1.42  	}
    1.43  	CSourceHookImpl::CHookList::~CHookList()
    1.44 @@ -718,19 +732,41 @@
    1.45  	}
    1.46  	IHookList::IIter *CSourceHookImpl::CHookList::GetIter()
    1.47  	{
    1.48 +		CIter *ret;
    1.49  		if (m_FreeIters)
    1.50  		{
    1.51 -			CIter *ret = m_FreeIters;
    1.52 +			ret = m_FreeIters;
    1.53  			m_FreeIters = ret->m_pNext;
    1.54  			ret->GoToBegin();
    1.55 -			return ret;
    1.56 +		}
    1.57 +		else
    1.58 +		{
    1.59 +			ret = new CIter(this);
    1.60  		}
    1.61 -		return new CIter(this);
    1.62 +		
    1.63 +		ret->m_pNext = m_UsedIters;
    1.64 +		ret->m_pPrev = NULL;
    1.65 +		if (m_UsedIters)
    1.66 +			m_UsedIters->m_pPrev = ret;
    1.67 +		m_UsedIters = ret;
    1.68 +
    1.69 +		return ret;
    1.70  	}
    1.71  	void CSourceHookImpl::CHookList::ReleaseIter(IIter *pIter)
    1.72  	{
    1.73  		CIter *pIter2 = static_cast<CIter*>(pIter);
    1.74 +
    1.75 +		// Unlink from m_UsedIters
    1.76 +
    1.77 +		if (pIter2->m_pNext)
    1.78 +			pIter2->m_pNext->m_pPrev = pIter2->m_pPrev;
    1.79 +		if (pIter2->m_pPrev)
    1.80 +			pIter2->m_pPrev->m_pNext = pIter2->m_pNext;
    1.81 +
    1.82 +		// Link to m_FreeIters
    1.83 +
    1.84  		pIter2->m_pNext = m_FreeIters;
    1.85 +
    1.86  		m_FreeIters = pIter2;
    1.87  	}
    1.88  
    1.89 @@ -750,13 +786,21 @@
    1.90  
    1.91  	bool CSourceHookImpl::CHookList::CIter::End()
    1.92  	{
    1.93 +		if (!m_pList)
    1.94 +			return false;
    1.95  		return m_Iter == m_pList->m_List.end();
    1.96  	}
    1.97  	void CSourceHookImpl::CHookList::CIter::Next()
    1.98  	{
    1.99 +		if (!m_pList)
   1.100 +			return;
   1.101  		++m_Iter;
   1.102  		SkipPaused();
   1.103  	}
   1.104 +	void CSourceHookImpl::CHookList::CIter::Clear()
   1.105 +	{
   1.106 +		m_pList = NULL;
   1.107 +	}
   1.108  	void CSourceHookImpl::CHookList::CIter::SkipPaused()
   1.109  	{
   1.110  		while (m_Iter != m_pList->m_List.end() && m_Iter->paused)