core/sourcehook/sourcehook_impl.h
changeset 739 968e67c7780c
parent 733 2365240861a2
child 768 e6394d70ced0
     1.1 --- a/core/sourcehook/sourcehook_impl.h	Fri Dec 17 22:20:10 2010 -0500
     1.2 +++ b/core/sourcehook/sourcehook_impl.h	Fri Dec 17 22:22:44 2010 -0500
     1.3 @@ -1,5 +1,5 @@
     1.4  /* ======== SourceHook ========
     1.5 -* Copyright (C) 2004-2008 Metamod:Source Development Team
     1.6 +* Copyright (C) 2004-2010 Metamod:Source Development Team
     1.7  * No warranties of any kind
     1.8  *
     1.9  * License: zlib/libpng
    1.10 @@ -189,6 +189,10 @@
    1.11  	{
    1.12  		struct CHookContext : IHookContext
    1.13  		{
    1.14 +			CHookContext() : m_CleanupTask(NULL)
    1.15 +			{
    1.16 +			}
    1.17 +
    1.18  			enum State
    1.19  			{
    1.20  				State_Born,
    1.21 @@ -224,6 +228,8 @@
    1.22  
    1.23  			bool m_CallOrig;
    1.24  
    1.25 +			ICleanupTask *m_CleanupTask;
    1.26 +
    1.27  			void SkipPaused(List<CHook>::iterator &iter, List<CHook> &list)
    1.28  			{
    1.29  				while (iter != list.end() && iter->IsPaused())
    1.30 @@ -238,12 +244,13 @@
    1.31  			void *GetOverrideRetPtr();
    1.32  			const void *GetOrigRetPtr();
    1.33  			bool ShouldCallOrig();
    1.34 +			void DoCleanupTaskAndDeleteIt();
    1.35  		};
    1.36  
    1.37  		class CVfnPtrList : public List<CVfnPtr>
    1.38  		{
    1.39  		public:
    1.40 -			CVfnPtr &GetVfnPtr(void *p);
    1.41 +			CVfnPtr *GetVfnPtr(void *p);
    1.42  		};
    1.43  
    1.44  		typedef CStack<CHookContext> HookContextStack;
    1.45 @@ -259,6 +266,7 @@
    1.46  
    1.47  			bool SetHookPaused(int hookid, bool paused);
    1.48  			CHookManList::iterator RemoveHookManager(CHookManList::iterator iter);
    1.49 +			List<CVfnPtr>::iterator RevertAndRemoveVfnPtr(List<CVfnPtr>::iterator vfnptr_iter);
    1.50  		public:
    1.51  			CSourceHookImpl();
    1.52  			virtual ~CSourceHookImpl();
    1.53 @@ -308,7 +316,7 @@
    1.54  
    1.55  			void DoRecall();
    1.56  
    1.57 -			IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origentry, META_RES *statusPtr,
    1.58 +			IHookContext *SetupHookLoop(IHookManagerInfo *hi, void *vfnptr, void *thisptr, void **origCallAddr, META_RES *statusPtr,
    1.59  				META_RES *prevResPtr, META_RES *curResPtr, const void *origRetPtr, void *overrideRetPtr);
    1.60  
    1.61  			void EndContext(IHookContext *pCtx);