sourcehook/sourcehook.cpp
changeset 42 390a2aec00e4
parent 41 534eac4c53ef
child 47 0d8950ea695b
     1.1 --- a/sourcehook/sourcehook.cpp	Fri Apr 29 20:29:46 2005 +0000
     1.2 +++ b/sourcehook/sourcehook.cpp	Sat Apr 30 15:48:46 2005 +0000
     1.3 @@ -212,12 +212,17 @@
     1.4  			hookman->vfnptrs.push_back(vfp);
     1.5  
     1.6  			// Alter vtable entry
     1.7 -			SetMemAccess(cur_vtptr, sizeof(void*) * tmp.vtbl_idx, SH_MEM_READ | SH_MEM_WRITE);
     1.8 +			SetMemAccess(cur_vtptr, sizeof(void*) * (tmp.vtbl_idx + 1), SH_MEM_READ | SH_MEM_WRITE);
     1.9  			*reinterpret_cast<void**>(cur_vfnptr) = *reinterpret_cast<void**>(hookman->hookfunc_vfnptr);
    1.10  
    1.11  			// Make vfnptr_iter point to the new element
    1.12  			vfnptr_iter = hookman->vfnptrs.end();
    1.13  			--vfnptr_iter;
    1.14 +
    1.15 +			// Now that it is done, check whether we have to update any callclasses
    1.16 +			for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
    1.17 +				if (cciter->cc.ptr == iface)
    1.18 +					ApplyCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx, vfnptr_iter->orig_entry);
    1.19  		}
    1.20  
    1.21  		HookManagerInfo::VfnPtr::IfaceListIter iface_iter = std::find(
    1.22 @@ -245,18 +250,6 @@
    1.23  			iface_iter->hooks_pre.push_back(hookinfo);
    1.24  
    1.25  
    1.26 -		// Now that it is done, check whether we have to update any callclasses
    1.27 -		for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
    1.28 -		{
    1.29 -			if (cciter->cc.ptr == iface)
    1.30 -			{
    1.31 -				ApplyCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx, vfnptr_iter->orig_entry);
    1.32 -
    1.33 -				// We can assume that there is no more callclass for the same iface
    1.34 -				break;
    1.35 -			}
    1.36 -		}
    1.37 -
    1.38  		return true;
    1.39  	}
    1.40  
    1.41 @@ -316,11 +309,17 @@
    1.42  							
    1.43  							hookman->vfnptrs.erase(vfnptr_iter);
    1.44  
    1.45 +							// Remove callclass patch
    1.46 +							for (Impl_CallClassList::iterator cciter = m_CallClasses.begin(); cciter != m_CallClasses.end(); ++cciter)
    1.47 +								if (cciter->cc.ptr == adjustediface)
    1.48 +									RemoveCallClassPatch(*cciter, tmp.vtbl_offs, tmp.vtbl_idx);
    1.49 +
    1.50  							if (hookman->vfnptrs.empty())
    1.51  							{
    1.52  								// Unregister the hook manager
    1.53  								hookman->func(HA_Unregister, NULL);
    1.54  							}
    1.55 +
    1.56  						}
    1.57  					}
    1.58  				}
    1.59 @@ -376,6 +375,28 @@
    1.60  		tmpvec[vtbl_idx] = orig_entry;
    1.61  	}
    1.62  
    1.63 +	void CSourceHookImpl::RemoveCallClassPatch(CallClassInfo &cc, int vtbl_offs, int vtbl_idx)
    1.64 +	{
    1.65 +		OrigVTables::iterator iter = cc.cc.vt.find(vtbl_offs);
    1.66 +		if (iter != cc.cc.vt.end())
    1.67 +		{
    1.68 +			if (iter->second.size() > (size_t)vtbl_idx)
    1.69 +			{
    1.70 +				iter->second[vtbl_idx] = 0;
    1.71 +				// Free some memory if possible
    1.72 +				OrigFuncs::reverse_iterator riter;
    1.73 +				for (riter = iter->second.rbegin(); riter != iter->second.rend(); ++riter)
    1.74 +				{
    1.75 +					if (*riter != 0)
    1.76 +						break;
    1.77 +				}
    1.78 +				iter->second.resize(iter->second.size() - (riter - iter->second.rbegin()));
    1.79 +				if (!iter->second.size())
    1.80 +					cc.cc.vt.erase(iter);
    1.81 +			}
    1.82 +		}
    1.83 +	}
    1.84 +
    1.85  	CSourceHookImpl::HookManInfoList::iterator CSourceHookImpl::FindHookMan(HookManInfoList::iterator begin,
    1.86  		HookManInfoList::iterator end, const char *proto, int vtblofs, int vtblidx)
    1.87  	{