rooty/HLMetaModOfficial
1
0
Fork 0
mirror of https://github.com/alliedmodders/metamod-source.git synced 2025-02-20 13:54:14 +01:00
Code Issues Releases Activity

Fix s2 crash on unload

Browse Source 
Replaces ISource2Server::Shutdown hook for ISource2ServerConfig::Disconnect
This commit is contained in:
GAMMACASE 2025-01-17 00:49:37 +03:00
parent 40dcdd4806
commit cd6632653e
2 changed files with 43 additions and 41 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
core/gamedll_bridge.cpp
View File

@ -65,7 +65,7 @@ public:
mfi.isVirtual = false;
#ifdef META_IS_SOURCE2
SourceHook::GetFuncInfo(&IServerGameDLL::Shutdown, mfi);
SourceHook::GetFuncInfo(&ISource2ServerConfig::Disconnect, mfi);
#else
SourceHook::GetFuncInfo(&IServerGameDLL::DLLShutdown, mfi);
#endif

82
loader/gamedll.cpp
View File

@ -264,7 +264,7 @@ gamedll_bridge_info g_bridge_info;
// IS2SC::AllowDedicatedServer - return true. remove hook.
// CreateInterfaceFn (IS2S) - hook Init and Shutdown
// IS2S::Init - do same as old ISGD::DLLInit, including core load. return orig. remove hook.
// IS2S::Shutdown - <-- this
// IS2SC::Disconnect - do same as old ISGD::DLLShutdown
enum InitReturnVal_t
{
@ -277,7 +277,7 @@ enum InitReturnVal_t
class ISource2ServerConfig
{
public:
virtual bool Connect(QueryValveInterface factory)
virtual bool Connect(QueryValveInterface factory)
{
g_bridge_info.engineFactory = factory;
g_bridge_info.fsFactory = factory;
@ -300,19 +300,52 @@ public:
void *addr;
intptr_t adjustor;
} s;
} u;
} u;
u.s.addr = is2sc_orig_connect;
u.s.adjustor = 0;
#endif
result = (((VEmptyClass *) config_iface)->*u.mfpnew)(factory);
result = (((VEmptyClass *)config_iface)->*u.mfpnew)(factory);
}
mm_PatchConnect(false);
return result;
}
virtual void Disconnect()
{
gamedll_bridge->Unload();
gamedll_bridge = NULL;
mm_UnloadMetamodLibrary();
/* Call original function */
{
union
{
void (VEmptyClass::*mfpnew)();
#if defined _WIN32
virtual bool AllowDedicatedServers(int universe) const
void *addr;
} u;
u.addr = isgd_orig_shutdown;
#else
struct
{
void *addr;
intptr_t adjustor;
} s;
} u;
u.s.addr = isgd_orig_shutdown;
u.s.adjustor = 0;
#endif
(((VEmptyClass *)config_iface)->*u.mfpnew)();
}
mm_UnloadLibrary(gamedll_lib);
gamedll_lib = NULL;
}
#if defined _WIN32
virtual bool AllowDedicatedServers(int universe) const
{
mm_PatchAllowDedicated(false);
return true;
@ -421,38 +454,6 @@ public:
return result;
}
virtual void Shutdown()
{
gamedll_bridge->Unload();
gamedll_bridge = NULL;
mm_UnloadMetamodLibrary();
/* Call original function */
{
union
{
void (VEmptyClass::*mfpnew)();
#if defined _WIN32
void *addr;
} u;
u.addr = isgd_orig_shutdown;
#else
struct
{
void *addr;
intptr_t adjustor;
} s;
} u;
u.s.addr = isgd_orig_shutdown;
u.s.adjustor = 0;
#endif
(((VEmptyClass *)gamedll_iface)->*u.mfpnew)();
}
mm_UnloadLibrary(gamedll_lib);
gamedll_lib = NULL;
}
};
class IServerGameDLL
@ -660,7 +661,7 @@ mm_PatchDllShutdown()
mfp.isVirtual = false;
if (g_is_source2)
{
SourceHook::GetFuncInfo(&ISource2Server::Shutdown, mfp);
SourceHook::GetFuncInfo(&ISource2ServerConfig::Disconnect, mfp);
}
else
{
@ -672,13 +673,14 @@ mm_PatchDllShutdown()
if (g_is_source2)
{
vtable_src = (void **)*(void **)&is2s_thunk;
vtable_src = (void **)*(void **)&is2sc_thunk;
vtable_dest = (void **)*(void **)config_iface;
}
else
{
vtable_src = (void **)*(void **)&isgd_thunk;
vtable_dest = (void **)*(void **)gamedll_iface;
}
vtable_dest = (void **)*(void **)gamedll_iface;
isgd_orig_shutdown = vtable_dest[isgd_shutdown_index];
vtable_dest[isgd_shutdown_index] = vtable_src[mfp.vtblindex];