YGGverse/xash3d-fwgs
1
0
Fork 0
mirror of https://github.com/YGGverse/xash3d-fwgs.git synced 2025-02-01 01:34:17 +00:00
Code Issues Projects Releases Wiki Activity

engine: fix FunctionFromName on MSVC, fix memory leak

Browse Source
This commit is contained in:
Alibek Omarov 2021-06-21 10:20:29 +03:00
parent 91ee9bd32a
commit 6e0d372504
1 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
engine/common/lib_common.c
View File

@ -43,31 +43,37 @@ void *COM_FunctionFromName_SR( void *hInstance, const char *pName )
char **funcs = NULL; char **funcs = NULL;
size_t numfuncs, i; size_t numfuncs, i;
void *f = NULL; void *f = NULL;
const char *func = NULL;
#ifdef XASH_ALLOW_SAVERESTORE_OFFSETS #ifdef XASH_ALLOW_SAVERESTORE_OFFSETS
if( !memcmp( pName, "ofs:",4 ) ) if( !memcmp( pName, "ofs:", 4 ))
return (byte*)svgame.dllFuncs.pfnGameInit + Q_atoi(pName + 4); return (byte*)svgame.dllFuncs.pfnGameInit + Q_atoi( pName + 4 );
#endif #endif
#if XASH_MSVC && XASH_X86 #if XASH_POSIX
funcs = COM_ConvertToLocalPlatform( MANGLE_VALVE, pName, &numfuncs );
#elif XASH_POSIX
funcs = COM_ConvertToLocalPlatform( MANGLE_ITANIUM, pName, &numfuncs ); funcs = COM_ConvertToLocalPlatform( MANGLE_ITANIUM, pName, &numfuncs );
#endif
if( funcs ) if( funcs )
{ {
for( i = 0; i < numfuncs; i++ ) for( i = 0; i < numfuncs; i++ )
{ {
f = COM_FunctionFromName( hInstance, funcs[i] ); if( !f )
f = COM_FunctionFromName( hInstance, funcs[i] );
Z_Free( funcs[i] ); Z_Free( funcs[i] );
if( f )
break;
} }
Z_Free( funcs ); Z_Free( funcs );
if( f ) return f; if( f ) return f;
} }
#elif XASH_MSVC
// TODO: COM_ConvertToLocalPlatform doesn't support MSVC yet
// also custom loader strips always MSVC mangling, so Win32
// platforms already use platform-neutral names
func = COM_GetPlatformNeutralName( pName );
if( func )
COM_FunctionFromName( hInstance, func );
#endif
return COM_FunctionFromName( hInstance, pName ); return COM_FunctionFromName( hInstance, pName );
} }