R5Reloaded/r5sdk
1
0
Fork 0
mirror of https://github.com/Mauler125/r5sdk.git synced 2025-02-09 19:15:03 +01:00
Code Issues Packages Projects Releases Wiki Activity

Detours: only keep duplication tracking code in debug builds

Browse Source 
This serves no purpose in release builds as all these issues must be resolved first before making a release.
This commit is contained in:
Kawe Mazidjatari 2025-02-05 00:36:48 +01:00
parent 27285fc087
commit d7ebf62c38
2 changed files with 12 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/thirdparty/detours/include/idetour.h vendored
View File

@ -27,7 +27,7 @@ public:
}; };
extern std::vector<IDetour*> g_DetourVec; extern std::vector<IDetour*> g_DetourVec;
std::size_t AddDetour(IDetour* pDetour); std::size_t AddDetour(IDetour* const pDetour);
#define ADDDETOUR(x,y) static std::size_t dummy_reg_##y = AddDetour( new x() ); #define ADDDETOUR(x,y) static std::size_t dummy_reg_##y = AddDetour( new x() );
#define XREGISTER(x,y) ADDDETOUR(x, y) #define XREGISTER(x,y) ADDDETOUR(x, y)

17
src/thirdparty/detours/src/idetour.cpp vendored
View File

@ -5,7 +5,9 @@
//===========================================================================// //===========================================================================//
#include <cassert> #include <cassert>
#include <vector> #include <vector>
#ifdef _DEBUG
#include <unordered_set> #include <unordered_set>
#endif // _DEBUG
#include <Windows.h> #include <Windows.h>
#include "../include/detours.h" #include "../include/detours.h"
#include "../include/idetour.h" #include "../include/idetour.h"
@ -15,18 +17,21 @@
// used by one class instance. This is to avoid duplicate registrations. // used by one class instance. This is to avoid duplicate registrations.
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
std::vector<IDetour*> g_DetourVec; std::vector<IDetour*> g_DetourVec;
std::unordered_set<IDetour*> g_DetourSet; #ifdef _DEBUG
static std::unordered_set<const IDetour*> s_DetourSet;
#endif // _DEBUG
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
// Purpose: adds a detour context to the list // Purpose: adds a detour context to the list
//----------------------------------------------------------------------------- //-----------------------------------------------------------------------------
std::size_t AddDetour(IDetour* pDetour) std::size_t AddDetour(IDetour* const pDetour)
{ {
IDetour* pVFTable = reinterpret_cast<IDetour**>(pDetour)[0]; #ifdef _DEBUG
auto p = g_DetourSet.insert(pVFTable); // Only register if VFTable isn't already registered. const IDetour* const pVFTable = reinterpret_cast<IDetour**>(pDetour)[0];
const auto p = s_DetourSet.insert(pVFTable); // Track duplicate registrations.
assert(p.second); // Code bug: duplicate registration!!! (called 'REGISTER(...)' from a header file?). assert(p.second); // Code bug: duplicate registration!!! (called 'REGISTER(...)' from a header file?).
p.second ? g_DetourVec.push_back(pDetour) : delete pDetour; #endif // _DEBUG
g_DetourVec.push_back(pDetour);
return g_DetourVec.size(); return g_DetourVec.size();
} }