source/metamod-source
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-12-07 10:28:30 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Added SH_GET_ORIG_VFNPTR_ENTRY

Browse Source 
--HG--
extra : convert_revision : svn%3Ac2935e3e-5518-0410-8daf-afa5dab7d4e3/trunk%40471
This commit is contained in:
Pavol Marko 2007-10-07 23:00:38 +00:00
parent 070b841c94
commit 53b48bab94
6 changed files with 99 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
sourcehook/generate/sourcehook.h
View File

@ -391,6 +391,14 @@ namespace SourceHook
*/ */
virtual void ResetIgnoreHooks(void *vfnptr) = 0; virtual void ResetIgnoreHooks(void *vfnptr) = 0;
/**
* @brief Finds the original entry of a virtual function pointer
*
* @param vfnptr The virtual function pointer
* @return The original entry if the virtual function pointer has been patched; NULL otherwise.
*/
virtual void *GetOrigVfnPtrEntry(void *vfnptr) = 0;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// For hook managers // For hook managers
@ -466,6 +474,20 @@ namespace SourceHook
return &ref; return &ref;
} }
}; };
template <class X, class MFP>
void *GetOrigVfnPtrEntry(X *pInstance, MFP mfp, ISourceHook *pSH)
{
SourceHook::MemFuncInfo info = {true, -1, 0, 0};
SourceHook::GetFuncInfo(pInstance, mfp, info);
void *vfnptr = reinterpret_cast<void*>(
*reinterpret_cast<void***>(reinterpret_cast<char*>(pInstance) + info.thisptroffs + info.vtbloffs) + info.vtblindex);
void *origentry = pSH->GetOrigVfnPtrEntry(vfnptr);
return origentry ? origentry : *reinterpret_cast<void**>(vfnptr);
}
} }
/************************************************************************/ /************************************************************************/
@ -588,6 +610,8 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \ SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \
} while (0) } while (0)
#define SH_GET_ORIG_VFNPTR_ENTRY(inst, mfp) (SourceHook::GetOrigVfnPtrEntry(inst, mfp, SH_GLOB_SHPTR))
// New ADD / REMOVE macros. // New ADD / REMOVE macros.
#define SH_STATIC(func) fastdelegate::MakeDelegate(func) #define SH_STATIC(func) fastdelegate::MakeDelegate(func)
#define SH_MEMBER(inst, func) fastdelegate::MakeDelegate(inst, func) #define SH_MEMBER(inst, func) fastdelegate::MakeDelegate(inst, func)

24
sourcehook/generate/sourcehook.hxx
View File

@ -391,6 +391,14 @@ namespace SourceHook
*/ */
virtual void ResetIgnoreHooks(void *vfnptr) = 0; virtual void ResetIgnoreHooks(void *vfnptr) = 0;
/**
* @brief Finds the original entry of a virtual function pointer
*
* @param vfnptr The virtual function pointer
* @return The original entry if the virtual function pointer has been patched; NULL otherwise.
*/
virtual void *GetOrigVfnPtrEntry(void *vfnptr) = 0;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// For hook managers // For hook managers
@ -466,6 +474,20 @@ namespace SourceHook
return &ref; return &ref;
} }
}; };
template <class X, class MFP>
void *GetOrigVfnPtrEntry(X *pInstance, MFP mfp, ISourceHook *pSH)
{
SourceHook::MemFuncInfo info = {true, -1, 0, 0};
SourceHook::GetFuncInfo(pInstance, mfp, info);
void *vfnptr = reinterpret_cast<void*>(
*reinterpret_cast<void***>(reinterpret_cast<char*>(pInstance) + info.thisptroffs + info.vtbloffs) + info.vtblindex);
void *origentry = pSH->GetOrigVfnPtrEntry(vfnptr);
return origentry ? origentry : *reinterpret_cast<void**>(vfnptr);
}
} }
/************************************************************************/ /************************************************************************/
@ -588,6 +610,8 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \ SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \
} while (0) } while (0)
#define SH_GET_ORIG_VFNPTR_ENTRY(inst, mfp) (SourceHook::GetOrigVfnPtrEntry(inst, mfp, SH_GLOB_SHPTR))
// New ADD / REMOVE macros. // New ADD / REMOVE macros.
#define SH_STATIC(func) fastdelegate::MakeDelegate(func) #define SH_STATIC(func) fastdelegate::MakeDelegate(func)
#define SH_MEMBER(inst, func) fastdelegate::MakeDelegate(inst, func) #define SH_MEMBER(inst, func) fastdelegate::MakeDelegate(inst, func)

19
sourcehook/sourcehook.cpp
View File

@ -733,6 +733,25 @@ namespace SourceHook
m_ContextStack.pop(); m_ContextStack.pop();
} }
void *CSourceHookImpl::GetOrigVfnPtrEntry(void *vfnptr)
{
for (CHookManContainerList::iterator hmcl_iter = m_HookManContainers.begin();
hmcl_iter != m_HookManContainers.end(); ++hmcl_iter)
{
for (CHookManagerContainer::iterator hookmaniter = hmcl_iter->begin();
hookmaniter != hmcl_iter->end(); ++hookmaniter)
{
for (List<CVfnPtr>::iterator vfnptr_iter = hookmaniter->GetVfnPtrList().begin();
vfnptr_iter != hookmaniter->GetVfnPtrList().end(); ++vfnptr_iter)
{
if (vfnptr_iter->GetPtr() == vfnptr)
return vfnptr_iter->GetOrigEntry();
}
}
}
return NULL;
}
void CSourceHookImpl::DoRecall() void CSourceHookImpl::DoRecall()
{ {
CHookContext newCtx; CHookContext newCtx;

24
sourcehook/sourcehook.h
View File

@ -391,6 +391,14 @@ namespace SourceHook
*/ */
virtual void ResetIgnoreHooks(void *vfnptr) = 0; virtual void ResetIgnoreHooks(void *vfnptr) = 0;
/**
* @brief Finds the original entry of a virtual function pointer
*
* @param vfnptr The virtual function pointer
* @return The original entry if the virtual function pointer has been patched; NULL otherwise.
*/
virtual void *GetOrigVfnPtrEntry(void *vfnptr) = 0;
////////////////////////////////////////////////////////////////////////// //////////////////////////////////////////////////////////////////////////
// For hook managers // For hook managers
@ -466,6 +474,20 @@ namespace SourceHook
return &ref; return &ref;
} }
}; };
template <class X, class MFP>
void *GetOrigVfnPtrEntry(X *pInstance, MFP mfp, ISourceHook *pSH)
{
SourceHook::MemFuncInfo info = {true, -1, 0, 0};
SourceHook::GetFuncInfo(pInstance, mfp, info);
void *vfnptr = reinterpret_cast<void*>(
*reinterpret_cast<void***>(reinterpret_cast<char*>(pInstance) + info.thisptroffs + info.vtbloffs) + info.vtblindex);
void *origentry = pSH->GetOrigVfnPtrEntry(vfnptr);
return origentry ? origentry : *reinterpret_cast<void**>(vfnptr);
}
} }
/************************************************************************/ /************************************************************************/
@ -588,6 +610,8 @@ SourceHook::CallClass<T> *SH_GET_CALLCLASS(T *p)
SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \ SH_MFHCls(hookname)::ms_MFI.vtbloffs = pvtbloffs; \
} while (0) } while (0)
#define SH_GET_ORIG_VFNPTR_ENTRY(inst, mfp) (SourceHook::GetOrigVfnPtrEntry(inst, mfp, SH_GLOB_SHPTR))
// New ADD / REMOVE macros. // New ADD / REMOVE macros.
#define SH_STATIC(func) fastdelegate::MakeDelegate(func) #define SH_STATIC(func) fastdelegate::MakeDelegate(func)
#define SH_MEMBER(inst, func) fastdelegate::MakeDelegate(inst, func) #define SH_MEMBER(inst, func) fastdelegate::MakeDelegate(inst, func)

2
sourcehook/sourcehook_impl.h
View File

@ -314,6 +314,8 @@ namespace SourceHook
void EndContext(IHookContext *pCtx); void EndContext(IHookContext *pCtx);
void *GetOrigVfnPtrEntry(void *vfnptr);
/** /**
* @brief Shut down the whole system, unregister all hook managers * @brief Shut down the whole system, unregister all hook managers
*/ */

6
sourcehook/test/test1.cpp
View File

@ -419,6 +419,8 @@ bool TestBasic(std::string &error)
Test test; Test test;
Test *pTest = &test; Test *pTest = &test;
void *pOrigVfnPtrF1 = (*reinterpret_cast<void***>(pTest))[0];
// 1) Get a call class and call the member through it and normally // 1) Get a call class and call the member through it and normally
SourceHook::CallClass<Test> *cc = SH_GET_CALLCLASS(pTest); SourceHook::CallClass<Test> *cc = SH_GET_CALLCLASS(pTest);
@ -433,6 +435,8 @@ bool TestBasic(std::string &error)
new State_F1_Called, new State_F1_Called,
NULL), "Part 1"); NULL), "Part 1");
CHECK_COND(SH_GET_ORIG_VFNPTR_ENTRY(pTest, &Test::F1) == pOrigVfnPtrF1, "Part S1");
// 2) Request a call class again // 2) Request a call class again
SourceHook::CallClass<Test> *cc2 = SH_GET_CALLCLASS(pTest); SourceHook::CallClass<Test> *cc2 = SH_GET_CALLCLASS(pTest);
ADD_STATE(State_F1_CallClassGenerated); ADD_STATE(State_F1_CallClassGenerated);
@ -471,6 +475,8 @@ bool TestBasic(std::string &error)
new State_F1_PreHandler_Called(&f1_handlers), new State_F1_PreHandler_Called(&f1_handlers),
NULL), "Part 3"); NULL), "Part 3");
CHECK_COND(SH_GET_ORIG_VFNPTR_ENTRY(pTest, &Test::F1) == pOrigVfnPtrF1, "Part S3");
// 4) Rerequest the callclass // 4) Rerequest the callclass
SH_RELEASE_CALLCLASS(cc); SH_RELEASE_CALLCLASS(cc);