From 415e5171076cf8bf429eb6b344c1c0b3b9af7a05 Mon Sep 17 00:00:00 2001 From: Alibek Omarov Date: Tue, 1 May 2018 21:51:43 +0300 Subject: [PATCH] Library loader refactoring. Not tested for platforms other than Linux --- engine/client/cl_gameui.c | 2 - engine/client/cl_main.c | 1 - engine/client/vgui/vgui_draw.c | 4 +- engine/common/filesystem.c | 2 +- engine/common/lib_common.c | 401 +------------------------- engine/common/lib_posix.c | 222 ++++++++++++++ engine/common/library.h | 5 +- engine/platform/android/android_lib.c | 62 ++++ engine/platform/android/android_lib.h | 24 ++ engine/platform/apple/ios_lib.c | 71 +++++ engine/platform/apple/ios_lib.h | 23 ++ engine/platform/emscripten/em_lib.c | 44 +++ engine/platform/emscripten/em_lib.h | 23 ++ engine/platform/win32/win_lib.c | 72 ++++- 14 files changed, 555 insertions(+), 401 deletions(-) create mode 100644 engine/common/lib_posix.c create mode 100644 engine/platform/android/android_lib.c create mode 100644 engine/platform/android/android_lib.h create mode 100644 engine/platform/apple/ios_lib.c create mode 100644 engine/platform/apple/ios_lib.h create mode 100644 engine/platform/emscripten/em_lib.c create mode 100644 engine/platform/emscripten/em_lib.h diff --git a/engine/client/cl_gameui.c b/engine/client/cl_gameui.c index ada5c22e..2c62b894 100644 --- a/engine/client/cl_gameui.c +++ b/engine/client/cl_gameui.c @@ -881,14 +881,12 @@ int pfnCheckGameDll( void ) if( svgame.hInstance ) return true; - COM_ResetLibraryError(); if(( hInst = COM_LoadLibrary( SI.gamedll, true, false )) != NULL ) { COM_FreeLibrary( hInst ); // don't increase linker's reference counter return true; } MsgDev( D_WARN, "Could not load server library:\n%s", COM_GetLibraryError() ); - COM_ResetLibraryError(); return false; } diff --git a/engine/client/cl_main.c b/engine/client/cl_main.c index 86da8b93..93bd18b1 100644 --- a/engine/client/cl_main.c +++ b/engine/client/cl_main.c @@ -2788,7 +2788,6 @@ void CL_Init( void ) IN_TouchInit(); - COM_ResetLibraryError(); if( !CL_LoadProgs( va( "%s/%s", GI->dll_path, SI.clientlib))) Host_Error( "can't initialize %s: %s\n", SI.clientlib, COM_GetLibraryError() ); diff --git a/engine/client/vgui/vgui_draw.c b/engine/client/vgui/vgui_draw.c index 8cc138cf..9df4f646 100644 --- a/engine/client/vgui/vgui_draw.c +++ b/engine/client/vgui/vgui_draw.c @@ -251,8 +251,6 @@ void VGui_Startup( int width, int height ) } #endif // XASH_INTERNAL_GAMELIBS - COM_ResetLibraryError(); - // HACKHACK: load vgui with correct path first if specified. // it will be reused while resolving vgui support and client deps if( Sys_GetParmFromCmdLine( "-vguilib", vguilib ) ) @@ -263,7 +261,7 @@ void VGui_Startup( int width, int height ) Q_strncpy( vguiloader, VGUI_SUPPORT_DLL, 256 ); if( !COM_LoadLibrary( vguilib, false, false ) ) - MsgDev( D_WARN, "VGUI preloading failed. Default library will be used!\n"); + MsgDev( D_WARN, "VGUI preloading failed. Default library will be used! Reason: %s\n", COM_GetLibraryError()); } if( Q_strstr( GI->client_lib, ".dll" ) ) diff --git a/engine/common/filesystem.c b/engine/common/filesystem.c index 58193bb6..b3630b39 100644 --- a/engine/common/filesystem.c +++ b/engine/common/filesystem.c @@ -2511,7 +2511,7 @@ dll_user_t *FS_FindLibrary( const char *dllname, qboolean directpath ) } dllpath[i] = '\0'; - COM_DefaultExtension( dllpath, ".dll" ); // apply ext if forget + COM_DefaultExtension( dllpath, "."OS_LIB_EXT ); // apply ext if forget search = FS_FindFile( dllpath, &index, false ); if( !search ) diff --git a/engine/common/lib_common.c b/engine/common/lib_common.c index a2f9de64..bf3e9412 100644 --- a/engine/common/lib_common.c +++ b/engine/common/lib_common.c @@ -1,6 +1,6 @@ /* -library.c - custom dlls loader -Copyright (C) 2008 Uncle Mike +lib_common.c - common dynamic library code +Copyright (C) 2018 Flying With Gauss This program is free software: you can redistribute it and/or modify it under the terms of the GNU General Public License as published by @@ -13,28 +13,27 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ -#define _GNU_SOURCE - #include "common.h" #include "library.h" #include "filesystem.h" #include "server.h" -char lasterror[1024] = ""; +static char s_szLastError[1024] = ""; + const char *COM_GetLibraryError() { - return lasterror; + return s_szLastError; } void COM_ResetLibraryError() { - lasterror[0] = 0; + s_szLastError[0] = 0; } void COM_PushLibraryError( const char *error ) { - Q_strncat( lasterror, error, sizeof( lasterror ) ); - Q_strncat( lasterror, "\n", sizeof( lasterror ) ); + Q_strncat( s_szLastError, error, sizeof( s_szLastError ) ); + Q_strncat( s_szLastError, "\n", sizeof( s_szLastError ) ); } void *COM_FunctionFromName_SR( void *hInstance, const char *pName ) @@ -46,392 +45,10 @@ void *COM_FunctionFromName_SR( void *hInstance, const char *pName ) return COM_FunctionFromName( hInstance, pName ); } -#ifdef XASH_ALLOW_SAVERESTORE_OFFSETS -char *COM_OffsetNameForFunction( void *function ) +const char *COM_OffsetNameForFunction( void *function ) { static string sname; Q_snprintf( sname, MAX_STRING, "ofs:%d", (int)(void*)(function - (void*)svgame.dllFuncs.pfnGameInit) ); MsgDev( D_NOTE, "COM_OffsetNameForFunction %s\n", sname ); return sname; } -#endif - -#ifndef _WIN32 - -#ifdef __ANDROID__ -#include "platform/android/dlsym-weak.h" -#endif - - -#ifdef NO_LIBDL - -#ifndef DLL_LOADER -#error Enable at least one dll backend!!! -#endif - -void *dlsym(void *handle, const char *symbol ) -{ - MsgDev( D_NOTE, "dlsym( %p, \"%s\" ): stub\n", handle, symbol ); - return NULL; -} -void *dlopen(const char *name, int flag ) -{ - MsgDev( D_NOTE, "dlopen( \"%s\", %d ): stub\n", name, flag ); - return NULL; -} -int dlclose(void *handle) -{ - MsgDev( D_NOTE, "dlsym( %p ): stub\n", handle ); - return 0; -} -char *dlerror( void ) -{ - return "Loading ELF libraries not supported in this build!\n"; -} -int dladdr( const void *addr, Dl_info *info ) -{ - return 0; -} - - - -#endif -#ifdef XASH_SDL -#include -#endif - -#if TARGET_OS_IPHONE - -static void *IOS_LoadLibraryInternal( const char *dllname ) -{ - void *pHandle; - string errorstring = ""; - char path[MAX_SYSPATH]; - - // load frameworks from Documents directory - // frameworks should be signed with same key with application - // Useful for debug to prevent rebuilding app on every library update - // NOTE: Apple polices forbids loading code from shared places -#ifdef ENABLE_FRAMEWORK_SIDELOAD - Q_snprintf( path, MAX_SYSPATH, "%s.framework/lib", dllname ); - if( pHandle = dlopen( path, RTLD_LAZY ) ) - return pHandle; - Q_snprintf( errorstring, MAX_STRING, dlerror() ); -#endif - -#ifdef DLOPEN_FRAMEWORKS - // load frameworks as it should be located in Xcode builds - Q_snprintf( path, MAX_SYSPATH, "%s%s.framework/lib", SDL_GetBasePath(), dllname ); -#else - // load libraries from app root to allow re-signing ipa with custom utilities - Q_snprintf( path, MAX_SYSPATH, "%s%s", SDL_GetBasePath(), dllname ); -#endif - pHandle = dlopen( path, RTLD_LAZY ); - if( !pHandle ) - { - COM_PushLibraryError(errorstring); - COM_PushLibraryError(dlerror()); - } - return pHandle; -} -extern char *g_szLibrarySuffix; -static void *IOS_LoadLibrary( const char *dllname ) -{ - - string name; - char *postfix = g_szLibrarySuffix; - char *pHandle; - - if( !postfix ) postfix = GI->gamefolder; - - Q_snprintf( name, MAX_STRING, "%s_%s", dllname, postfix ); - pHandle = IOS_LoadLibraryInternal( name ); - if( pHandle ) - return pHandle; - return IOS_LoadLibraryInternal( dllname ); -} - -#endif - -#ifdef __EMSCRIPTEN__ -#include -#endif - -void *COM_LoadLibrary( const char *dllname, int build_ordinals_table, qboolean directpath ) -{ - dll_user_t *hInst = NULL; - void *pHandle = NULL; - - // platforms where gameinfo mechanism is impossible - // or not implemented -#if TARGET_OS_IPHONE - { - return IOS_LoadLibrary( dllname ); - } -#elif defined( __EMSCRIPTEN__ ) - { -#ifdef EMSCRIPTEN_LIB_FS - char path[MAX_SYSPATH]; - string prefix; - Q_strcpy(prefix, getenv( "LIBRARY_PREFIX" ) ); - Q_snprintf( path, MAX_SYSPATH, "%s%s%s", prefix, dllname, getenv( "LIBRARY_SUFFIX" ) ); - pHandle = dlopen( path, RTLD_LAZY ); - if( !pHandle ) - { - COM_PushLibraryError( va("Loading %s:\n", path ) ); - COM_PushLibraryError( dlerror() ); - } - return pHandle; -#else - // get handle of preloaded library outside fs - return EM_ASM_INT( return DLFCN.loadedLibNames[Pointer_stringify($0)], (int)dllname ); -#endif - } -#elif defined( __ANDROID__ ) - { - char path[MAX_SYSPATH]; - const char *libdir[2]; - int i; - - libdir[0] = getenv("XASH3D_GAMELIBDIR"); - libdir[1] = getenv("XASH3D_ENGLIBDIR"); - - for( i = 0; i < 2; i++ ) - { - Q_snprintf( path, MAX_SYSPATH, "%s/lib%s"POSTFIX"."OS_LIB_EXT, libdir[i], dllname ); - pHandle = dlopen( path, RTLD_LAZY ); - if( pHandle ) - return pHandle; - - COM_PushLibraryError( dlerror() ); - } - - // HACKHACK: keep old behaviour for compability - pHandle = dlopen( dllname, RTLD_LAZY ); - if( pHandle ) - return pHandle; - - COM_PushLibraryError( dlerror() ); - } -#endif - - // platforms where gameinfo mechanism is working goes here - // and use FS_FindLibrary - hInst = FS_FindLibrary( dllname, false ); - if( !hInst ) - { - // HACKHACK: direct load dll -#ifdef DLL_LOADER - if( host.enabledll && ( pHandle = Loader_LoadLibrary(dllname)) ) - { - return pHandle; - } -#endif - - // try to find by linker(LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, LD_32_LIBRARY_PATH and so on...) - if( !pHandle ) - { - pHandle = dlopen( dllname, RTLD_LAZY ); - if( pHandle ) - return pHandle; - - COM_PushLibraryError( va( "Failed to find library %s", dllname )); - COM_PushLibraryError( dlerror() ); - return NULL; - } - } - - if( hInst->custom_loader ) - { - COM_PushLibraryError( va( "Custom library loader is not available. Extract library %s and fix gameinfo.txt!", hInst->fullPath )); - Mem_Free( hInst ); - return NULL; - } - -#ifdef DLL_LOADER - if( host.enabledll && ( !Q_stricmp( FS_FileExtension( hInst->shortPath ), "dll" ) ) ) - { - if( hInst->encrypted ) - { - COM_PushLibraryError( va( "Library %s is encrypted. Cannot load", hInst->shortPath ) ); - Mem_Free( hInst ); - return NULL; - } - - if( !( hInst->hInstance = Loader_LoadLibrary( hInst->fullPath ) ) ) - { - COM_PushLibraryError( va( "Failed to load DLL with DLL loader: %s", hInst->shortPath ) ); - Mem_Free( hInst ); - return NULL; - } - } - else -#endif - { - if( !( hInst->hInstance = dlopen( hInst->fullPath, RTLD_LAZY ) ) ) - { - COM_PushLibraryError( dlerror() ); - Mem_Free( hInst ); - return NULL; - } - } - - pHandle = hInst->hInstance; - - Mem_Free( hInst ); - - return pHandle; -} - -void COM_FreeLibrary( void *hInstance ) -{ -#ifdef DLL_LOADER - void *wm; - if( host.enabledll && (wm = Loader_GetDllHandle( hInstance )) ) - return Loader_FreeLibrary( hInstance ); - else -#endif -#if !defined __EMSCRIPTEN__ || defined EMSCRIPTEN_LIB_FS - dlclose( hInstance ); -#endif -} - -void *COM_GetProcAddress( void *hInstance, const char *name ) -{ -#ifdef DLL_LOADER - void *wm; - if( host.enabledll && (wm = Loader_GetDllHandle( hInstance )) ) - return Loader_GetProcAddress(hInstance, name); - else -#endif - return dlsym( hInstance, name ); -} - -void *COM_FunctionFromName( void *hInstance, const char *pName ) -{ - void *function; -#ifdef DLL_LOADER - void *wm; - if( host.enabledll && (wm = Loader_GetDllHandle( hInstance )) ) - return Loader_GetProcAddress(hInstance, pName); - else -#endif - if( !( function = dlsym( hInstance, pName ) ) ) - { -#ifdef __ANDROID__ - // Shitty Android's dlsym don't resolve weak symbols - if( !( function = dlsym_weak( hInstance, pName ) ) ) -#endif - { - MsgDev(D_ERROR, "FunctionFromName: Can't get symbol %s: %s\n", pName, dlerror()); - } - } - return function; -} - -#ifdef XASH_DYNAMIC_DLADDR -int d_dladdr( void *sym, Dl_info *info ) -{ - static int (*dladdr_real) ( void *sym, Dl_info *info ); - - if( !dladdr_real ) - dladdr_real = dlsym( (void*)(size_t)(-1), "dladdr" ); - - Q_memset( info, 0, sizeof( *info ) ); - - if( !dladdr_real ) - return -1; - - return dladdr_real( sym, info ); -} -#endif - -const char *COM_NameForFunction( void *hInstance, void *function ) -{ -#ifdef DLL_LOADER - void *wm; - if( host.enabledll && (wm = Loader_GetDllHandle( hInstance )) ) - return Loader_GetFuncName_int(wm, function); - else -#endif - // Note: dladdr() is a glibc extension - { - Dl_info info = {0}; - dladdr((void*)function, &info); - if(info.dli_sname) - return info.dli_sname; - } -#ifdef XASH_ALLOW_SAVERESTORE_OFFSETS - return COM_OffsetNameForFunction( function ); -#else - return NULL; -#endif -} -#elif defined XASH_64BIT -#include -void *COM_LoadLibrary( const char *dllname, int build_ordinals_table ) -{ - return LoadLibraryA( dllname ); -} -void COM_FreeLibrary( void *hInstance ) -{ - FreeLibrary( hInstance ); -} - - -void *COM_GetProcAddress( void *hInstance, const char *name ) -{ - return GetProcAddress( hInstance, name ); -} - -void *COM_FunctionFromName( void *hInstance, const char *name ) -{ - return GetProcAddress( hInstance, name ); -} - -const char *COM_NameForFunction( void *hInstance, void *function ) -{ -#if 0 - static qboolean initialized = false; - if( initialized ) - { - char message[1024]; - int len = 0; - size_t i; - HANDLE process = GetCurrentProcess(); - HANDLE thread = GetCurrentThread(); - IMAGEHLP_LINE64 line; - DWORD dline = 0; - DWORD options; - CONTEXT context; - STACKFRAME64 stackframe; - DWORD image; - char buffer[sizeof( IMAGEHLP_SYMBOL64) + MAX_SYM_NAME * sizeof(TCHAR)]; - PIMAGEHLP_SYMBOL64 symbol = ( PIMAGEHLP_SYMBOL64)buffer; - memset( symbol, 0, sizeof(IMAGEHLP_SYMBOL64) + MAX_SYM_NAME ); - symbol->SizeOfStruct = sizeof( IMAGEHLP_SYMBOL64); - symbol->MaxNameLength = MAX_SYM_NAME; - DWORD displacement = 0; - - options = SymGetOptions(); - SymSetOptions( options ); - - SymInitialize( process, NULL, TRUE ); - - if( SymGetSymFromAddr64( process, function, &displacement, symbol ) ) - { - Msg( "%s\n", symbol->Name ); - return copystring( symbol->Name ); - } - - } -#endif - -#ifdef XASH_ALLOW_SAVERESTORE_OFFSETS - return COM_OffsetNameForFunction( function ); -#endif - - return NULL; -} - -#endif diff --git a/engine/common/lib_posix.c b/engine/common/lib_posix.c new file mode 100644 index 00000000..d4fa90fd --- /dev/null +++ b/engine/common/lib_posix.c @@ -0,0 +1,222 @@ +/* +lib_posix.c - dynamic library code for POSIX systems +Copyright (C) 2018 Flying With Gauss + +This program is free software: you can redistribute it and/sor modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*/ + +#ifndef _WIN32 // see win_lib.c +#define _GNU_SOURCE + +#include "common.h" +#include "library.h" +#include "filesystem.h" +#include "server.h" +#include "platform/android/android_lib.h" +#include "platform/emscripten/em_lib.h" +#include "platform/apple/ios_lib.h" + +#ifdef XASH_NO_LIBDL +#ifndef XASH_DLL_LOADER +#error Enable at least one dll backend!!! +#endif // XASH_DLL_LOADER + +void *dlsym(void *handle, const char *symbol ) +{ + Con_DPrintf( "dlsym( %p, \"%s\" ): stub\n", handle, symbol ); + return NULL; +} + +void *dlopen(const char *name, int flag ) +{ + Con_DPrintf( "dlopen( \"%s\", %d ): stub\n", name, flag ); + return NULL; +} + +int dlclose(void *handle) +{ + Con_DPrintf( "dlsym( %p ): stub\n", handle ); + return 0; +} + +char *dlerror( void ) +{ + return "Loading ELF libraries not supported in this build!\n"; +} + +int dladdr( const void *addr, Dl_info *info ) +{ + return 0; +} +#endif // XASH_NO_LIBDL + +void *COM_LoadLibrary( const char *dllname, int build_ordinals_table, qboolean directpath ) +{ + dll_user_t *hInst = NULL; + void *pHandle = NULL; + + COM_ResetLibraryError(); + + // platforms where gameinfo mechanism is impossible +#if TARGET_OS_IPHONE + return IOS_LoadLibrary( dllname ); +#elif defined( __EMSCRIPTEN__ ) + return EMSCRIPTEN_LoadLibrary( dllname ); +#elif defined( __ANDROID__ ) + return ANDROID_LoadLibrary( dllname ); +#endif + + // platforms where gameinfo mechanism is working goes here + // and use FS_FindLibrary + hInst = FS_FindLibrary( dllname, false ); + if( !hInst ) + { + // HACKHACK: direct load dll +#ifdef DLL_LOADER + if( host.enabledll && ( pHandle = Loader_LoadLibrary(dllname)) ) + { + return pHandle; + } +#endif + + // try to find by linker(LD_LIBRARY_PATH, DYLD_LIBRARY_PATH, LD_32_LIBRARY_PATH and so on...) + if( !pHandle ) + { + pHandle = dlopen( dllname, RTLD_LAZY ); + if( pHandle ) + return pHandle; + + COM_PushLibraryError( va( "Failed to find library %s", dllname )); + COM_PushLibraryError( dlerror() ); + return NULL; + } + } + + if( hInst->custom_loader ) + { + COM_PushLibraryError( va( "Custom library loader is not available. Extract library %s and fix gameinfo.txt!", hInst->fullPath )); + Mem_Free( hInst ); + return NULL; + } + +#ifdef DLL_LOADER + if( host.enabledll && ( !Q_stricmp( FS_FileExtension( hInst->shortPath ), "dll" ) ) ) + { + if( hInst->encrypted ) + { + COM_PushLibraryError( va( "Library %s is encrypted. Cannot load", hInst->shortPath ) ); + Mem_Free( hInst ); + return NULL; + } + + if( !( hInst->hInstance = Loader_LoadLibrary( hInst->fullPath ) ) ) + { + COM_PushLibraryError( va( "Failed to load DLL with DLL loader: %s", hInst->shortPath ) ); + Mem_Free( hInst ); + return NULL; + } + } + else +#endif + { + if( !( hInst->hInstance = dlopen( hInst->fullPath, RTLD_LAZY ) ) ) + { + COM_PushLibraryError( dlerror() ); + Mem_Free( hInst ); + return NULL; + } + } + + pHandle = hInst->hInstance; + + Mem_Free( hInst ); + + return pHandle; +} + +void COM_FreeLibrary( void *hInstance ) +{ +#ifdef DLL_LOADER + void *wm; + if( host.enabledll && (wm = Loader_GetDllHandle( hInstance )) ) + return Loader_FreeLibrary( hInstance ); + else +#endif +#if !defined __EMSCRIPTEN__ || defined EMSCRIPTEN_LIB_FS + dlclose( hInstance ); +#endif +} + +void *COM_GetProcAddress( void *hInstance, const char *name ) +{ +#ifdef DLL_LOADER + void *wm; + if( host.enabledll && (wm = Loader_GetDllHandle( hInstance )) ) + return Loader_GetProcAddress(hInstance, name); + else +#endif +#if defined(__ANDROID__) + return ANDROID_GetProcAddress( hInstance, name ); +#else + return dlsym( hInstance, name ); +#endif +} + +void *COM_FunctionFromName( void *hInstance, const char *pName ) +{ + void *function; + if( !( function = COM_GetProcAddress( hInstance, pName ) ) ) + { + MsgDev(D_ERROR, "FunctionFromName: Can't get symbol %s: %s\n", pName, dlerror()); + } + return function; +} + +#ifdef XASH_DYNAMIC_DLADDR +int d_dladdr( void *sym, Dl_info *info ) +{ + static int (*dladdr_real) ( void *sym, Dl_info *info ); + + if( !dladdr_real ) + dladdr_real = dlsym( (void*)(size_t)(-1), "dladdr" ); + + Q_memset( info, 0, sizeof( *info ) ); + + if( !dladdr_real ) + return -1; + + return dladdr_real( sym, info ); +} +#endif + +const char *COM_NameForFunction( void *hInstance, void *function ) +{ +#ifdef DLL_LOADER + void *wm; + if( host.enabledll && (wm = Loader_GetDllHandle( hInstance )) ) + return Loader_GetFuncName_int(wm, function); + else +#endif + // NOTE: dladdr() is a glibc extension + { + Dl_info info = {0}; + dladdr((void*)function, &info); + if(info.dli_sname) + return info.dli_sname; + } +#ifdef XASH_ALLOW_SAVERESTORE_OFFSETS + return COM_OffsetNameForFunction( function ); +#else + return NULL; +#endif +} + +#endif // _WIN32 diff --git a/engine/common/library.h b/engine/common/library.h index bb27bea9..310696b6 100644 --- a/engine/common/library.h +++ b/engine/common/library.h @@ -157,7 +157,10 @@ const char *COM_NameForFunction( void *hInstance, void *function ); void *COM_FunctionFromName_SR( void *hInstance, const char *pName ); // Save/Restore version void *COM_FunctionFromName( void *hInstance, const char *pName ); void COM_FreeLibrary( void *hInstance ); -void COM_ResetLibraryError( void ); const char *COM_GetLibraryError( void ); +// TODO: Move to internal? +void COM_ResetLibraryError( void ); +void COM_PushLibraryError( const char *error ); +const char *COM_OffsetNameForFunction( void *function ); #endif//LIBRARY_H diff --git a/engine/platform/android/android_lib.c b/engine/platform/android/android_lib.c new file mode 100644 index 00000000..2beda5e7 --- /dev/null +++ b/engine/platform/android/android_lib.c @@ -0,0 +1,62 @@ +/* +android_lib.c - dynamic library code for Android OS +Copyright (C) 2018 Flying With Gauss + +This program is free software: you can redistribute it and/sor modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*/ +#ifdef __ANDROID__ + +#include "common.h" +#include "library.h" +#include "filesystem.h" +#include "server.h" +#include "platform/android/android_lib.h" +#include "platform/android/dlsym_weak.h" // Android < 5.0 + +void *ANDROID_LoadLibrary( const char *dllname ) +{ + char path[MAX_SYSPATH]; + const char *libdir[2]; + int i; + void *pHandle; + + libdir[0] = getenv("XASH3D_GAMELIBDIR"); + libdir[1] = getenv("XASH3D_ENGLIBDIR"); + + for( i = 0; i < 2; i++ ) + { + Q_snprintf( path, MAX_SYSPATH, "%s/lib%s"POSTFIX"."OS_LIB_EXT, libdir[i], dllname ); + pHandle = dlopen( path, RTLD_LAZY ); + if( pHandle ) + return pHandle; + + COM_PushLibraryError( dlerror() ); + } + + // HACKHACK: keep old behaviour for compability + pHandle = dlopen( dllname, RTLD_LAZY ); + if( pHandle ) + return pHandle; + + COM_PushLibraryError( dlerror() ); +} + +void *ANDROID_GetProcAddress( void *hInstance, const char *name ) +{ + void *p = dlsym_weak( hInstance, name ); + + if( p ) return p; + + return dlsym( hInstance, name ); +} + + +#endif // __ANDROID__ diff --git a/engine/platform/android/android_lib.h b/engine/platform/android/android_lib.h new file mode 100644 index 00000000..bf56affd --- /dev/null +++ b/engine/platform/android/android_lib.h @@ -0,0 +1,24 @@ +/* +android_lib.h - dynamic library code for Android OS +Copyright (C) 2018 Flying With Gauss + +This program is free software: you can redistribute it and/sor modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*/ +#pragma once +#ifdef __ANDROID__ +#ifndef ANDROID_LIB_H +#define ANDROID_LIB_H + +void *ANDROID_LoadLibrary( const char *dllname ); +void *ANDROID_GetProcAddress( void *hInstance, const char *name ); + +#endif // ANDROID_LIB_H +#endif // __ANDROID__ diff --git a/engine/platform/apple/ios_lib.c b/engine/platform/apple/ios_lib.c new file mode 100644 index 00000000..8a3e317a --- /dev/null +++ b/engine/platform/apple/ios_lib.c @@ -0,0 +1,71 @@ +/* +ios_lib.c - dynamic library code for iOS +Copyright (C) 2017-2018 mittorn + +This program is free software: you can redistribute it and/sor modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*/ +#if TARGET_OS_IPHONE +#include +#include "common.h" +#include "library.h" +#include "filesystem.h" +#include "server.h" +#include "platform/apple/ios_lib.h" + +static void *IOS_LoadLibraryInternal( const char *dllname ) +{ + void *pHandle; + string errorstring = ""; + char path[MAX_SYSPATH]; + + // load frameworks from Documents directory + // frameworks should be signed with same key with application + // Useful for debug to prevent rebuilding app on every library update + // NOTE: Apple polices forbids loading code from shared places +#ifdef ENABLE_FRAMEWORK_SIDELOAD + Q_snprintf( path, MAX_SYSPATH, "%s.framework/lib", dllname ); + if( pHandle = dlopen( path, RTLD_LAZY ) ) + return pHandle; + Q_snprintf( errorstring, MAX_STRING, dlerror() ); +#endif + +#ifdef DLOPEN_FRAMEWORKS + // load frameworks as it should be located in Xcode builds + Q_snprintf( path, MAX_SYSPATH, "%s%s.framework/lib", SDL_GetBasePath(), dllname ); +#else + // load libraries from app root to allow re-signing ipa with custom utilities + Q_snprintf( path, MAX_SYSPATH, "%s%s", SDL_GetBasePath(), dllname ); +#endif + pHandle = dlopen( path, RTLD_LAZY ); + if( !pHandle ) + { + COM_PushLibraryError(errorstring); + COM_PushLibraryError(dlerror()); + } + return pHandle; +} +extern char *g_szLibrarySuffix; +static void *IOS_LoadLibrary( const char *dllname ) +{ + + string name; + char *postfix = g_szLibrarySuffix; + char *pHandle; + + if( !postfix ) postfix = GI->gamefolder; + + Q_snprintf( name, MAX_STRING, "%s_%s", dllname, postfix ); + pHandle = IOS_LoadLibraryInternal( name ); + if( pHandle ) + return pHandle; + return IOS_LoadLibraryInternal( dllname ); +} +#endif // TARGET_OS_IPHONE diff --git a/engine/platform/apple/ios_lib.h b/engine/platform/apple/ios_lib.h new file mode 100644 index 00000000..6b911c1e --- /dev/null +++ b/engine/platform/apple/ios_lib.h @@ -0,0 +1,23 @@ +/* +ios_lib.h - dynamic library code for iOS +Copyright (C) 2017-2018 mittorn + +This program is free software: you can redistribute it and/sor modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*/ +#pragma once +#if TARGET_OS_IPHONE +#ifndef IOS_LIB_H +#define IOS_LIB_H + +void *IOS_LoadLibrary( const char *dllname ); + +#endif // IOS_LIB_H +#endif // TARGET_OS_IPHONE diff --git a/engine/platform/emscripten/em_lib.c b/engine/platform/emscripten/em_lib.c new file mode 100644 index 00000000..9c78a850 --- /dev/null +++ b/engine/platform/emscripten/em_lib.c @@ -0,0 +1,44 @@ +/* +em_lib.h - dynamic library code for iOS +Copyright (C) 2017-2018 mittorn + +This program is free software: you can redistribute it and/sor modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*/ +#ifdef __EMSCRIPTEN__ +#include +#include "common.h" +#include "library.h" +#include "filesystem.h" +#include "server.h" + +void *EMSCRIPTEN_LoadLibrary( const char *dllname ) +{ + void *pHandle = NULL; + +#ifdef EMSCRIPTEN_LIB_FS + char path[MAX_SYSPATH]; + string prefix; + Q_strcpy(prefix, getenv( "LIBRARY_PREFIX" ) ); + Q_snprintf( path, MAX_SYSPATH, "%s%s%s", prefix, dllname, getenv( "LIBRARY_SUFFIX" ) ); + pHandle = dlopen( path, RTLD_LAZY ); + if( !pHandle ) + { + COM_PushLibraryError( va("Loading %s:\n", path ) ); + COM_PushLibraryError( dlerror() ); + } + return pHandle; +#else + // get handle of preloaded library outside fs + return EM_ASM_INT( return DLFCN.loadedLibNames[Pointer_stringify($0)], (int)dllname ); +#endif +} + +#endif // __EMSCRIPTEN__ diff --git a/engine/platform/emscripten/em_lib.h b/engine/platform/emscripten/em_lib.h new file mode 100644 index 00000000..4d131f1b --- /dev/null +++ b/engine/platform/emscripten/em_lib.h @@ -0,0 +1,23 @@ +/* +em_lib.h - dynamic library code for iOS +Copyright (C) 2017-2018 mittorn + +This program is free software: you can redistribute it and/sor modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 3 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. +*/ +#pragma once +#ifdef __EMSCRIPTEN__ +#ifndef EM_LIB_H +#define EM_LIB_H + +void *EMSCRIPTEN_LoadLibrary( const char *dllname ); + +#endif // EM_LIB_H +#endif // __EMSCRIPTEN__ diff --git a/engine/platform/win32/win_lib.c b/engine/platform/win32/win_lib.c index 76c3dc44..dbfb6fc2 100644 --- a/engine/platform/win32/win_lib.c +++ b/engine/platform/win32/win_lib.c @@ -13,10 +13,79 @@ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License for more details. */ -#if defined(_WIN32) && !defined(XASH_64BIT) +#if defined(_WIN32) #include "common.h" #include "library.h" +#ifdef XASH_64BIT +#include + +void *COM_LoadLibrary( const char *dllname, int build_ordinals_table ) +{ + return LoadLibraryA( dllname ); +} + +void COM_FreeLibrary( void *hInstance ) +{ + FreeLibrary( hInstance ); +} + +void *COM_GetProcAddress( void *hInstance, const char *name ) +{ + return GetProcAddress( hInstance, name ); +} + +void *COM_FunctionFromName( void *hInstance, const char *name ) +{ + return GetProcAddress( hInstance, name ); +} + +const char *COM_NameForFunction( void *hInstance, void *function ) +{ +#if 0 + static qboolean initialized = false; + if( initialized ) + { + char message[1024]; + int len = 0; + size_t i; + HANDLE process = GetCurrentProcess(); + HANDLE thread = GetCurrentThread(); + IMAGEHLP_LINE64 line; + DWORD dline = 0; + DWORD options; + CONTEXT context; + STACKFRAME64 stackframe; + DWORD image; + char buffer[sizeof( IMAGEHLP_SYMBOL64) + MAX_SYM_NAME * sizeof(TCHAR)]; + PIMAGEHLP_SYMBOL64 symbol = ( PIMAGEHLP_SYMBOL64)buffer; + memset( symbol, 0, sizeof(IMAGEHLP_SYMBOL64) + MAX_SYM_NAME ); + symbol->SizeOfStruct = sizeof( IMAGEHLP_SYMBOL64); + symbol->MaxNameLength = MAX_SYM_NAME; + DWORD displacement = 0; + + options = SymGetOptions(); + SymSetOptions( options ); + + SymInitialize( process, NULL, TRUE ); + + if( SymGetSymFromAddr64( process, function, &displacement, symbol ) ) + { + Msg( "%s\n", symbol->Name ); + return copystring( symbol->Name ); + } + + } +#endif + +#ifdef XASH_ALLOW_SAVERESTORE_OFFSETS + return COM_OffsetNameForFunction( function ); +#endif + + return NULL; +} +#else // XASH_64BIT + /* --------------------------------------------------------------- @@ -890,4 +959,5 @@ const char *COM_NameForFunction( void *hInstance, dword function ) return NULL; } +#endif // XASH_64BIT #endif // _WIN32