X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/846e1424e2f563b699e7fcb81d10cf6f2246487f..49e399d8c0f2683a885bfec77e43cfde3b2249f4:/src/common/dynlib.cpp?ds=sidebyside diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 876f60c07d..3aa8cc8758 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -22,15 +22,17 @@ #endif #include "wx/wxprec.h" -#if defined(__WINDOWS__) -#include "wx/msw/private.h" -#endif #ifdef __BORLANDC__ #pragma hdrstop #endif + #if wxUSE_DYNLIB_CLASS +#if defined(__WINDOWS__) + #include "wx/msw/private.h" +#endif + #include "wx/dynlib.h" #include "wx/filefn.h" #include "wx/intl.h" @@ -41,9 +43,15 @@ // conditional compilation // ---------------------------------------------------------------------------- -#if defined(HAVE_DLOPEN) +#if defined(__WXPM__) || defined(__EMX__) +# define INCL_DOS +# include +# define wxDllOpen(error, lib, handle) DosLoadModule(error, sizeof(error), lib, &handle) +# define wxDllGetSymbol(handle, modaddr) DosQueryProcAddr(handle, 1L, NULL, (PFN*)modaddr) +# define wxDllClose(handle) DosFreeModule(handle) +#elif defined(HAVE_DLOPEN) # define wxDllOpen(lib) dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/) -# define wxDllGetSymbol(handle, name) dlsym(handle, name.mb_str()) +# define wxDllGetSymbol(handle, name) dlsym(handle, name) # define wxDllClose dlclose #elif defined(HAVE_SHL_LOAD) # define wxDllOpen(lib) shl_load(lib.fn_str(), BIND_DEFERRED, 0) @@ -60,20 +68,16 @@ #elif defined(__WINDOWS__) // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary # ifdef __WIN32__ -# define wxDllOpen(lib) ::LoadLibraryEx(lib, 0, 0) +#ifdef _UNICODE +# define wxDllOpen(lib) ::LoadLibraryExW(lib, 0, 0) +#else +# define wxDllOpen(lib) ::LoadLibraryExA(lib, 0, 0) +#endif # else // Win16 # define wxDllOpen(lib) ::LoadLibrary(lib) # endif // Win32/16 # define wxDllGetSymbol(handle, name) ::GetProcAddress(handle, name) # define wxDllClose ::FreeLibrary - -#elif defined(__OS2__) - -# define INCL_DOS -# include -# define wxDllOpen(error, lib, handle) DosLoadModule(error, sizeof(error), lib, &handle) -# define wxDllGetSymbol(handle, modaddr) DosQueryProcAddr(handle, 1L, NULL, (PFN*)modaddr) -# define wxDllClose(handle) DosFreeModule(handle) #else # error "Don't know how to load shared libraries on this platform." #endif // OS @@ -84,34 +88,20 @@ wxLibraries wxTheLibraries; -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- +// ============================================================================ +// implementation +// ============================================================================ // construct the full name from the base shared object name: adds a .dll // suffix under Windows or .so under Unix static wxString ConstructLibraryName(const wxString& basename) { - wxString fullname(basename); - -#if defined(__UNIX__) -# if defined(__HPUX__) - fullname << ".sl"; -# else //__HPUX__ - fullname << ".so"; -# endif //__HPUX__ -#elif defined(__WINDOWS__) || defined(__OS2__) - fullname << ".dll"; -#endif + wxString fullname; + fullname << basename << wxDllLoader::GetDllExt(); return fullname; } -// ============================================================================ -// implementation -// ============================================================================ - - // --------------------------------------------------------------------------- // wxLibrary (one instance per dynamic library) // --------------------------------------------------------------------------- @@ -180,11 +170,29 @@ void *wxLibrary::GetSymbol(const wxString& symbname) // wxDllLoader // --------------------------------------------------------------------------- +/* static */ +wxString wxDllLoader::GetDllExt() +{ + wxString ext; + +#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__) + ext = _T(".dll"); +#elif defined(__UNIX__) +# if defined(__HPUX__) + ext = _T(".sl"); +# else //__HPUX__ + ext = _T(".so"); +# endif //__HPUX__ +#endif + + return ext; +} + /* static */ wxDllType wxDllLoader::GetProgramHandle(void) { -#if defined( HAVE_DLOPEN ) +#if defined( HAVE_DLOPEN ) && !defined(__EMX__) // optain handle for main program return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/); #elif defined (HAVE_SHL_LOAD) @@ -204,8 +212,8 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success) #if defined(__WXMAC__) FSSpec myFSSpec ; - Ptr myMainAddr ; - Str255 myErrName ; + Ptr myMainAddr ; + Str255 myErrName ; wxMacPathToFSSpec( libname , &myFSSpec ) ; if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr , @@ -215,8 +223,8 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success) wxASSERT_MSG( 1 , (char*)myErrName ) ; return NULL ; } -#elif defined(__OS2__) - char zError[256] = ""; +#elif defined(__WXPM__) || defined(__EMX__) + char zError[256] = ""; wxDllOpen(zError, libname, handle); #else // !Mac handle = wxDllOpen(libname); @@ -224,7 +232,33 @@ wxDllLoader::LoadLibrary(const wxString & libname, bool *success) if ( !handle ) { - wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str()); + wxString msg(_("Failed to load shared library '%s'")); + +#ifdef HAVE_DLERROR + const char *errmsg = dlerror(); + if ( errmsg ) + { + // the error string format is "libname: ...", but we already have + // libname, so cut it off + const char *p = strchr(errmsg, ':'); + if ( p ) + { + if ( *++p == ' ' ) + p++; + } + else + { + p = errmsg; + } + + msg += _T(" (%s)"); + wxLogError(msg, libname.c_str(), p); + } + else +#endif // HAVE_DLERROR + { + wxLogSysError(msg, libname.c_str()); + } } if ( success ) @@ -252,17 +286,18 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name) #if defined( __WXMAC__ ) Ptr symAddress ; CFragSymbolClass symClass ; - Str255 symName ; + Str255 symName ; strcpy( (char*) symName , name ) ; c2pstr( (char*) symName ) ; if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr ) symbol = (void *)symAddress ; -#elif defined( __OS2__ ) +#elif defined( __WXPM__ ) || defined(__EMX__) wxDllGetSymbol(dllHandle, symbol); #else - symbol = wxDllGetSymbol(dllHandle, name); + // mb_str() is necessary in Unicode build + symbol = wxDllGetSymbol(dllHandle, name.mb_str()); #endif if ( !symbol )