X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8a0d4cf6c5e9fe357ca3e873b81c0fda10e4b217..37b8e6798782278fdfe4f3c1291aaff55cdbb8c9:/src/common/dynlib.cpp diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 447fb80a87..5086123d93 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -18,15 +18,14 @@ // ---------------------------------------------------------------------------- #ifdef __GNUG__ - #pragma implementation "dynlib.h" +# pragma implementation "dynlib.h" #endif #include "wx/wxprec.h" -#ifdef __BORLANDC__ +#ifdef __BORLANDC__ #pragma hdrstop -#endif //__BORLANDC__ - +#endif #if wxUSE_DYNLIB_CLASS #include "wx/dynlib.h" @@ -40,27 +39,42 @@ // ---------------------------------------------------------------------------- #if defined(HAVE_DLOPEN) - #define wxDllOpen(lib) dlopen(lib, RTLD_LAZY) - #define wxDllGetSymbol(handle, name) dlsym(handle, (char *)name) - #define wxDllClose dlclose +# define wxDllOpen(lib) dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/) +# define wxDllGetSymbol(handle, name) dlsym(handle, name.mb_str()) +# define wxDllClose dlclose #elif defined(HAVE_SHL_LOAD) - #define wxDllOpen(lib) shl_load(lib, BIND_DEFERRED, 0) - #define wxDllClose shl_unload +# define wxDllOpen(lib) shl_load(lib.fn_str(), BIND_DEFERRED, 0) +# define wxDllClose shl_unload - static inline void *wxDllGetSymbol(shl_t handle, const char *name) + static inline void *wxDllGetSymbol(shl_t handle, const wxString& name) { void *sym; - if ( shl_findsym(&handle, name, TYPE_UNDEFINED, &sym) == 0 ) + if ( shl_findsym(&handle, name.mb_str(), TYPE_UNDEFINED, &sym) == 0 ) return sym; else return (void *)0; } #elif defined(__WINDOWS__) - #define wxDllOpen(lib) ::LoadLibrary(lib) - #define wxDllGetSymbol(handle, name) ::GetProcAddress(handle, name) - #define wxDllClose ::FreeLibrary +# include + + // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary +# ifdef __WIN32__ +# define wxDllOpen(lib) ::LoadLibraryEx(lib, 0, 0) +# 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." +# error "Don't know how to load shared libraries on this platform." #endif // OS // --------------------------------------------------------------------------- @@ -80,12 +94,12 @@ static wxString ConstructLibraryName(const wxString& basename) wxString fullname(basename); #if defined(__UNIX__) - #if defined(__HPUX__) +# if defined(__HPUX__) fullname << ".sl"; - #else //__HPUX__ +# else //__HPUX__ fullname << ".so"; - #endif //__HPUX__ -#elif defined(__WINDOWS__) +# endif //__HPUX__ +#elif defined(__WINDOWS__) || defined(__OS2__) fullname << ".dll"; #endif @@ -96,6 +110,7 @@ static wxString ConstructLibraryName(const wxString& basename) // implementation // ============================================================================ + // --------------------------------------------------------------------------- // wxLibrary (one instance per dynamic library) // --------------------------------------------------------------------------- @@ -156,6 +171,80 @@ void wxLibrary::PrepareClasses(wxClassInfo *first) } void *wxLibrary::GetSymbol(const wxString& symbname) +{ + return wxDllLoader::GetSymbol(m_handle, symbname); +} + +// --------------------------------------------------------------------------- +// wxDllLoader +// --------------------------------------------------------------------------- + +/* static */ +wxDllType +wxDllLoader::GetProgramHandle(void) +{ +#if defined( HAVE_DLOPEN ) + // optain handle for main program + return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/); +#elif defined (HAVE_SHL_LOAD) + // shl_findsymbol with NULL handle looks up in main program + return 0; +#else + wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2")); + return 0; +#endif +} + +/* static */ +wxDllType +wxDllLoader::LoadLibrary(const wxString & libname, bool *success) +{ + wxDllType handle; + +#if defined(__WXMAC__) + FSSpec myFSSpec ; + Ptr myMainAddr ; + Str255 myErrName ; + + wxMacPathToFSSpec( libname , &myFSSpec ) ; + if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr , + myErrName ) != noErr ) + { + p2cstr( myErrName ) ; + wxASSERT_MSG( 1 , (char*)myErrName ) ; + return NULL ; + } +#elif defined(__OS2__) + char zError[256] = ""; + wxDllOpen(zError, libname, handle); +#else // !Mac + handle = wxDllOpen(libname); +#endif // OS + + if ( !handle ) + { + wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str()); + } + + if ( success ) + { + *success = handle != 0; + } + + return handle; +} + + +/* static */ +void +wxDllLoader::UnloadLibrary(wxDllType handle) +{ + wxDllClose(handle); +} + +/* static */ +void * +wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name) { void *symbol = NULL; // return value @@ -164,25 +253,22 @@ void *wxLibrary::GetSymbol(const wxString& symbname) CFragSymbolClass symClass ; Str255 symName ; - strcpy( (char*) symName , symbname ) ; + strcpy( (char*) symName , name ) ; c2pstr( (char*) symName ) ; - if ( FindSymbol( m_handle , symName , &symAddress , &symClass ) == noErr ) - { - symbol = (void *)symAddress ; - } + if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr ) + symbol = (void *)symAddress ; +#elif defined( __OS2__ ) + wxDllGetSymbol(dllHandle, symbol); #else - // VZ: hmm... why is WXSTRINGCAST needed? if it's really modified, we - // should make a copy of it - symbol = wxDllGetSymbol(m_handle, WXSTRINGCAST symbname); + symbol = wxDllGetSymbol(dllHandle, name); #endif if ( !symbol ) { wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"), - symbname.c_str()); + name.c_str()); } - return symbol; } @@ -190,7 +276,7 @@ void *wxLibrary::GetSymbol(const wxString& symbname) // wxLibraries (only one instance should normally exist) // --------------------------------------------------------------------------- -wxLibraries::wxLibraries() +wxLibraries::wxLibraries():m_loaded(wxKEY_STRING) { } @@ -212,30 +298,39 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name) wxLibrary *lib; wxClassInfo *old_sm_first; +#if defined(__VISAGECPP__) + node = m_loaded.Find(name.GetData()); + if (node != NULL) + return ((wxLibrary *)node->Data()); +#else // !OS/2 if ( (node = m_loaded.Find(name.GetData())) ) return ((wxLibrary *)node->Data()); - +#endif // If DLL shares data, this is necessary. old_sm_first = wxClassInfo::sm_first; wxClassInfo::sm_first = NULL; - wxString lib_name = ConstructLibraryName(name); + wxString libname = ConstructLibraryName(name); +/* + Unix automatically builds that library name, at least for dlopen() +*/ +#if 0 #if defined(__UNIX__) // found the first file in LD_LIBRARY_PATH with this name wxString libPath("/lib:/usr/lib"); // system path first const char *envLibPath = getenv("LD_LIBRARY_PATH"); if ( envLibPath ) - libPath << ':' << envLibPath; - wxStringTokenizer tokenizer(libPath, ':'); + libPath << wxT(':') << envLibPath; + wxStringTokenizer tokenizer(libPath, wxT(':')); while ( tokenizer.HasMoreToken() ) { wxString fullname(tokenizer.NextToken()); - fullname << '/' << lib_name; + fullname << wxT('/') << libname; if ( wxFileExists(fullname) ) { - lib_name = fullname; + libname = fullname; // found the library break; @@ -244,40 +339,18 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name) //else: not found in the path, leave the name as is (secutiry risk?) #endif // __UNIX__ +#endif - wxDllType handle; - -#if defined(__WXMAC__) - FSSpec myFSSpec ; - Ptr myMainAddr ; - Str255 myErrName ; - - wxMacPathToFSSpec( lib_name , &myFSSpec ) ; - if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr , - myErrName ) != noErr ) - { - p2cstr( myErrName ) ; - wxASSERT_MSG( 1 , (char*)myErrName ) ; - return NULL ; - } -#else // !Mac - handle = wxDllOpen(lib_name); -#endif // OS - - if ( !handle ) + bool success = FALSE; + wxDllType handle = wxDllLoader::LoadLibrary(libname, &success); + if(success) { - wxLogSysError(_("Failed to load shared library '%s'"), - lib_name.c_str()); - - return NULL; + lib = new wxLibrary(handle); + wxClassInfo::sm_first = old_sm_first; + m_loaded.Append(name.GetData(), lib); } - - lib = new wxLibrary(handle); - - wxClassInfo::sm_first = old_sm_first; - - m_loaded.Append(name.GetData(), lib); - + else + lib = NULL; return lib; }