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

Revert "Hook Connect on ISource2Server instead of ISource2ServerConfig."

Browse Source 
This reverts commit c07bab9763.
This commit is contained in:
Nicholas Hastings 2015-09-21 13:28:52 -04:00
parent c07bab9763
commit 5ecfdcaa2b
1 changed files with 27 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
loader/gamedll.cpp
View File

@ -36,6 +36,7 @@
#include "gamedll.h" #include "gamedll.h"
class IServerGameDLL; class IServerGameDLL;
class ISource2ServerConfig;
#define MAX_GAMEDLL_PATHS 10 #define MAX_GAMEDLL_PATHS 10
@ -47,6 +48,7 @@ static void *gamedll_libs[MAX_GAMEDLL_PATHS];
static unsigned int gamedll_path_count = 0; static unsigned int gamedll_path_count = 0;
static void *gamedll_lib = NULL; static void *gamedll_lib = NULL;
static IServerGameDLL *gamedll_iface = NULL; static IServerGameDLL *gamedll_iface = NULL;
static ISource2ServerConfig *config_iface = NULL;
static QueryValveInterface gamedll_qvi = NULL; static QueryValveInterface gamedll_qvi = NULL;
static int gamedll_version = 0; static int gamedll_version = 0;
static int isgd_shutdown_index = -1; static int isgd_shutdown_index = -1;
@ -231,7 +233,7 @@ mm_PatchConnect(bool patch);
static void *isgd_orig_init = NULL; static void *isgd_orig_init = NULL;
static void *isgd_orig_shutdown = NULL; static void *isgd_orig_shutdown = NULL;
static void *is2s_orig_connect = NULL; static void *is2sc_orig_connect = NULL;
class VEmptyClass class VEmptyClass
{ {
@ -254,7 +256,7 @@ enum InitReturnVal_t
INIT_LAST_VAL, INIT_LAST_VAL,
}; };
class ISource2Server class ISource2ServerConfig
{ {
public: public:
virtual bool Connect(QueryValveInterface factory) virtual bool Connect(QueryValveInterface factory)
@ -273,7 +275,7 @@ public:
#if defined _WIN32 #if defined _WIN32
void *addr; void *addr;
} u; } u;
u.addr = is2s_orig_connect; u.addr = is2sc_orig_connect;
#else #else
struct struct
{ {
@ -281,16 +283,22 @@ public:
intptr_t adjustor; intptr_t adjustor;
} s; } s;
} u; } u;
u.s.addr = is2s_orig_connect; u.s.addr = is2sc_orig_connect;
u.s.adjustor = 0; u.s.adjustor = 0;
#endif #endif
result = (((VEmptyClass *) gamedll_iface)->*u.mfpnew)(factory); result = (((VEmptyClass *) config_iface)->*u.mfpnew)(factory);
} }
mm_PatchConnect(false); mm_PatchConnect(false);
return result; return result;
} }
};
class ISource2Server
{
public:
virtual bool Connect(QueryValveInterface factory) { return true; }
virtual void Disconnect() {} virtual void Disconnect() {}
virtual void *QueryInterface(const char *pInterfaceName) { return nullptr; } virtual void *QueryInterface(const char *pInterfaceName) { return nullptr; }
@ -558,6 +566,7 @@ public:
static IServerGameDLL isgd_thunk; static IServerGameDLL isgd_thunk;
static ISource2Server is2s_thunk; static ISource2Server is2s_thunk;
static ISource2ServerConfig is2sc_thunk;
static void static void
mm_PatchDllInit(bool patch) mm_PatchDllInit(bool patch)
@ -648,14 +657,14 @@ mm_PatchConnect(bool patch)
void **vtable_dest; void **vtable_dest;
SourceHook::MemFuncInfo mfp; SourceHook::MemFuncInfo mfp;
SourceHook::GetFuncInfo(&ISource2Server::Connect, mfp); SourceHook::GetFuncInfo(&ISource2ServerConfig::Connect, mfp);
assert(mfp.isVirtual); assert(mfp.isVirtual);
assert(mfp.thisptroffs == 0); assert(mfp.thisptroffs == 0);
assert(mfp.vtbloffs == 0); assert(mfp.vtbloffs == 0);
vtable_src = (void **) *(void **) &is2s_thunk; vtable_src = (void **) *(void **) &is2sc_thunk;
vtable_dest = (void **) *(void **) gamedll_iface; vtable_dest = (void **) *(void **) config_iface;
SourceHook::SetMemAccess(&vtable_dest[mfp.vtblindex], SourceHook::SetMemAccess(&vtable_dest[mfp.vtblindex],
sizeof(void*), sizeof(void*),
@ -663,15 +672,15 @@ mm_PatchConnect(bool patch)
if (patch) if (patch)
{ {
assert(is2s_orig_connect == NULL); assert(is2sc_orig_connect == NULL);
is2s_orig_connect = vtable_dest[mfp.vtblindex]; is2sc_orig_connect = vtable_dest[mfp.vtblindex];
vtable_dest[mfp.vtblindex] = vtable_src[mfp.vtblindex]; vtable_dest[mfp.vtblindex] = vtable_src[mfp.vtblindex];
} }
else else
{ {
assert(is2s_orig_connect != NULL); assert(is2sc_orig_connect != NULL);
vtable_dest[mfp.vtblindex] = is2s_orig_connect; vtable_dest[mfp.vtblindex] = is2sc_orig_connect;
is2s_orig_connect = NULL; is2sc_orig_connect = NULL;
} }
} }
@ -718,8 +727,11 @@ mm_GameDllRequest(const char *name, int *ret)
{ {
mm_FreeCachedLibraries(); mm_FreeCachedLibraries();
gamedll_lib = lib; gamedll_lib = lib;
config_iface = (ISource2ServerConfig *) ptr;
gamedll_qvi = qvi; gamedll_qvi = qvi;
mm_PatchConnect(true);
if (ret != NULL) if (ret != NULL)
*ret = 0; *ret = 0;
return ptr; return ptr;
@ -729,7 +741,6 @@ mm_GameDllRequest(const char *name, int *ret)
{ {
gamedll_iface = (IServerGameDLL *)gamedll_qvi(name, ret); gamedll_iface = (IServerGameDLL *)gamedll_qvi(name, ret);
gamedll_version = atoi(&name[13]); gamedll_version = atoi(&name[13]);
mm_PatchConnect(true);
mm_PatchDllInit(true); mm_PatchDllInit(true);
if (ret != NULL) if (ret != NULL)