X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/73c5006d21d0bc2bd1564ed3187097c4b18083fc..c13d6ac1ea199d1e3908d40d129e2fd5a4d82df7:/src/common/dynlib.cpp?ds=sidebyside

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 40bba2b170..d8ab264fb4 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -1,14 +1,18 @@
 /////////////////////////////////////////////////////////////////////////////
-// Name:        dynlib.cpp
+// Name:        src/common/dynlib.cpp
 // Purpose:     Dynamic library management
 // Author:      Guilhem Lavaux
 // Modified by:
 // Created:     20/07/98
 // RCS-ID:      $Id$
-// Copyright:   (c) Guilhem Lavaux
-// Licence:     wxWindows license
+// Copyright:   (c) 1998 Guilhem Lavaux
+//                  2000-2005 Vadim Zeitlin
+// Licence:     wxWindows licence
 /////////////////////////////////////////////////////////////////////////////
 
+//FIXME:  This class isn't really common at all, it should be moved into
+//        platform dependent files (already done for Windows and Unix)
+
 // ============================================================================
 // declarations
 // ============================================================================
@@ -17,315 +21,261 @@
 // headers
 // ----------------------------------------------------------------------------
 
-#ifdef __GNUG__
-#   pragma implementation "dynlib.h"
-#endif
-
 #include  "wx/wxprec.h"
 
-#ifdef    __BORLANDC__
-#   pragma hdrstop
-#endif  //__BORLANDC__
+#ifdef __BORLANDC__
+    #pragma hdrstop
+#endif
 
 #if wxUSE_DYNLIB_CLASS
 
 #include "wx/dynlib.h"
-#include "wx/filefn.h"
-#include "wx/intl.h"
-#include "wx/log.h"
-#include "wx/tokenzr.h"
 
-// ----------------------------------------------------------------------------
-// conditional compilation
-// ----------------------------------------------------------------------------
-
-#if defined(HAVE_DLOPEN)
-#   define wxDllOpen(lib)                dlopen(lib.fn_str(), 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.fn_str(), BIND_DEFERRED, 0)
-#   define wxDllClose      shl_unload
+#ifndef WX_PRECOMP
+    #include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/app.h"
+    #include "wx/utils.h"
+#endif //WX_PRECOMP
 
-    static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
-    {
-        void *sym;
-        if ( shl_findsym(&handle, name.mb_str(), TYPE_UNDEFINED, &sym) == 0 )
-            return sym;
-        else
-            return (void *)0;
-    }
-#elif defined(__WINDOWS__)
-#   include <windows.h>
-
-    // 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
-#else
-#   error "Don't know how to load shared libraries on this platform."
-#endif // OS
-
-// ---------------------------------------------------------------------------
-// Global variables
-// ---------------------------------------------------------------------------
-
-wxLibraries wxTheLibraries;
-
-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
+#include "wx/filefn.h"
+#include "wx/filename.h"        // for SplitPath()
+#include "wx/platinfo.h"
 
-// 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__)
-    fullname << ".dll";
-#endif
+#include "wx/arrimpl.cpp"
 
-    return fullname;
-}
+WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray)
 
 // ============================================================================
 // implementation
 // ============================================================================
 
-
 // ---------------------------------------------------------------------------
-// wxLibrary (one instance per dynamic library)
+// wxDynamicLibrary
 // ---------------------------------------------------------------------------
 
-wxLibrary::wxLibrary(wxDllType handle)
-{
-    typedef wxClassInfo *(*t_get_first)(void);
-    t_get_first get_first;
-
-    m_handle = handle;
+#if defined(__WXPM__) || defined(__EMX__)
+    const wxString wxDynamicLibrary::ms_dllext(wxT(".dll"));
+#endif
 
-    // Some system may use a local heap for library.
-    get_first = (t_get_first)GetSymbol("wxGetClassFirst");
-    // It is a wxWindows DLL.
-    if (get_first)
-        PrepareClasses(get_first());
-}
+// for MSW/Unix it is defined in platform-specific file
+#if !(defined(__WXMSW__) || defined(__UNIX__)) || defined(__EMX__)
 
-wxLibrary::~wxLibrary()
+wxDllType wxDynamicLibrary::GetProgramHandle()
 {
-    if ( m_handle )
-    {
-        wxDllClose(m_handle);
-    }
+   wxFAIL_MSG( wxT("GetProgramHandle() is not implemented under this platform"));
+   return 0;
 }
 
-wxObject *wxLibrary::CreateObject(const wxString& name)
-{
-    wxClassInfo *info = (wxClassInfo *)classTable.Get(name);
+#endif // __WXMSW__ || __UNIX__
 
-    if (!info)
-        return NULL;
-
-    return info->CreateObject();
-}
 
-void wxLibrary::PrepareClasses(wxClassInfo *first)
+bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags)
 {
-    // Index all class infos by their class name
-    wxClassInfo *info = first;
-    while (info)
+    wxASSERT_MSG(m_handle == 0, wxT("Library already loaded."));
+
+    // add the proper extension for the DLL ourselves unless told not to
+    wxString libname = libnameOrig;
+    if ( !(flags & wxDL_VERBATIM) )
     {
-        if (info->m_className)
-            classTable.Put(info->m_className, (wxObject *)info);
-        info = info->GetNext();
+        // and also check that the libname doesn't already have it
+        wxString ext;
+        wxFileName::SplitPath(libname, NULL, NULL, &ext);
+        if ( ext.empty() )
+        {
+            libname += GetDllExt();
+        }
     }
 
-    // Set base pointers for each wxClassInfo
-    info = first;
-    while (info)
+    // different ways to load a shared library
+    //
+    // FIXME: should go to the platform-specific files!
+#if defined(__WXPM__) || defined(__EMX__)
+    char err[256] = "";
+    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
+#else // this should be the only remaining branch eventually
+    m_handle = RawLoad(libname, flags);
+#endif
+
+    if ( m_handle == 0 && !(flags & wxDL_QUIET) )
     {
-        if (info->GetBaseClassName1())
-            info->m_baseInfo1 = (wxClassInfo *)classTable.Get(info->GetBaseClassName1());
-        if (info->GetBaseClassName2())
-            info->m_baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
-        info = info->m_next;
+#ifdef wxHAVE_DYNLIB_ERROR
+        Error();
+#else
+        wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str());
+#endif
     }
-}
 
-void *wxLibrary::GetSymbol(const wxString& symbname)
-{
-   return wxDllLoader::GetSymbol(m_handle, symbname);
+    return IsLoaded();
 }
 
-// ---------------------------------------------------------------------------
-// wxDllLoader
-// ---------------------------------------------------------------------------
+// for MSW and Unix this is implemented in the platform-specific file
+//
+// TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp!
+#if (!defined(__WXMSW__) && !defined(__UNIX__)) || defined(__EMX__)
 
 /* static */
-wxDllType
-wxDllLoader::LoadLibrary(const wxString & lib_name, bool *success)
+void wxDynamicLibrary::Unload(wxDllType handle)
 {
-   wxASSERT(success);
-   
-   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 )
-   {
-      wxLogSysError(_("Failed to load shared library '%s'"),
-                    lib_name.c_str());
-      *success = FALSE;
-      return NULL;
-   }
-   *success = TRUE;
-   return handle;
+#if defined(__OS2__) || defined(__EMX__)
+    DosFreeModule( handle );
+#else
+    #error  "runtime shared lib support not implemented"
+#endif
 }
 
-/* static */
-void *
-wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
+#endif // !(__WXMSW__ || __UNIX__)
+
+void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
 {
-   void *symbol = NULL;    // return value
-
-#if defined( __WXMAC__ )
-   Ptr symAddress ;
-   CFragSymbolClass symClass ;
-   Str255	symName ;
-   
-   strcpy( (char*) symName , name ) ;
-   c2pstr( (char*) symName ) ;
-   
-   if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
-      symbol = (void *)symAddress ; 
+    wxCHECK_MSG( IsLoaded(), NULL,
+                 wxT("Can't load symbol from unloaded library") );
+
+    void    *symbol = 0;
+
+    wxUnusedVar(symbol);
+#if defined(__WXPM__) || defined(__EMX__)
+    DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
 #else
-    symbol = wxDllGetSymbol(dllHandle, name);
+    symbol = RawGetSymbol(m_handle, name);
 #endif
 
+    if ( success )
+        *success = symbol != NULL;
+
+    return symbol;
+}
+
+void *wxDynamicLibrary::GetSymbol(const wxString& name, bool *success) const
+{
+    void *symbol = DoGetSymbol(name, success);
     if ( !symbol )
     {
-       wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
-                     name.c_str());
+#ifdef wxHAVE_DYNLIB_ERROR
+        Error();
+#else
+        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
+                      name.c_str());
+#endif
     }
+
     return symbol;
 }
 
-// ---------------------------------------------------------------------------
-// wxLibraries (only one instance should normally exist)
-// ---------------------------------------------------------------------------
+// ----------------------------------------------------------------------------
+// informational methods
+// ----------------------------------------------------------------------------
 
-wxLibraries::wxLibraries()
+/*static*/
+wxString
+wxDynamicLibrary::CanonicalizeName(const wxString& name,
+                                   wxDynamicLibraryCategory cat)
 {
-}
+    wxString nameCanonic;
 
-wxLibraries::~wxLibraries()
-{
-    wxNode *node = m_loaded.First();
+    // under Unix the library names usually start with "lib" prefix, add it
+#if defined(__UNIX__) && !defined(__EMX__)
+    switch ( cat )
+    {
+        default:
+            wxFAIL_MSG( wxT("unknown wxDynamicLibraryCategory value") );
+            // fall through
 
-    while (node) {
-        wxLibrary *lib = (wxLibrary *)node->Data();
-        delete lib;
+        case wxDL_MODULE:
+            // don't do anything for modules, their names are arbitrary
+            break;
 
-        node = node->Next();
+        case wxDL_LIBRARY:
+            // library names should start with "lib" under Unix
+            nameCanonic = wxT("lib");
+            break;
     }
+#else // !__UNIX__
+    wxUnusedVar(cat);
+#endif // __UNIX__/!__UNIX__
+
+    nameCanonic << name << GetDllExt();
+    return nameCanonic;
 }
 
-wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
+/*static*/
+wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
+                                                  wxPluginCategory cat)
 {
-    wxNode *node;
-    wxLibrary *lib;
-    wxClassInfo *old_sm_first;
-
-    if ( (node = m_loaded.Find(name.GetData())) )
-        return ((wxLibrary *)node->Data());
-
-    // If DLL shares data, this is necessary.
-    old_sm_first = wxClassInfo::sm_first;
-    wxClassInfo::sm_first = NULL;
-
-    wxString lib_name = 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, _T(':'));
-    while ( tokenizer.HasMoreToken() )
+    wxString suffix;
+    if ( cat == wxDL_PLUGIN_GUI )
     {
-        wxString fullname(tokenizer.NextToken());
+        suffix = wxPlatformInfo::Get().GetPortIdShortName();
+    }
+#if wxUSE_UNICODE
+    suffix << wxT('u');
+#endif
+#ifdef __WXDEBUG__
+    suffix << wxT('d');
+#endif
 
-        fullname << '/' << lib_name;
-        if ( wxFileExists(fullname) )
-        {
-            lib_name = fullname;
+    if ( !suffix.empty() )
+        suffix = wxString(wxT("_")) + suffix;
 
-            // found the library
-            break;
-        }
-    }
-    //else: not found in the path, leave the name as is (secutiry risk?)
+#define WXSTRINGIZE(x)  #x
+#if defined(__UNIX__) && !defined(__EMX__)
+    #if (wxMINOR_VERSION % 2) == 0
+        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)
+    #else
+        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) "." WXSTRINGIZE(z)
+    #endif
+#else
+    #if (wxMINOR_VERSION % 2) == 0
+        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y)
+    #else
+        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y) WXSTRINGIZE(z)
+    #endif
+#endif
 
-#endif // __UNIX__
+    suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
+                                           wxRELEASE_NUMBER));
+#undef wxDLLVER
+#undef WXSTRINGIZE
+
+#ifdef __WINDOWS__
+    // Add compiler identification:
+    #if defined(__GNUG__)
+        suffix << wxT("_gcc");
+    #elif defined(__VISUALC__)
+        suffix << wxT("_vc");
+    #elif defined(__WATCOMC__)
+        suffix << wxT("_wat");
+    #elif defined(__BORLANDC__)
+        suffix << wxT("_bcc");
+    #endif
 #endif
 
-    bool success = FALSE;
-    wxDllType handle = wxDllLoader::LoadLibrary(lib_name, &success);
-    if(success)
-    {
-       lib = new wxLibrary(handle);
-       wxClassInfo::sm_first = old_sm_first;
-       m_loaded.Append(name.GetData(), lib);
-    }
-    else
-       lib = NULL;
-    return lib;
+    return CanonicalizeName(name + suffix, wxDL_MODULE);
 }
 
-wxObject *wxLibraries::CreateObject(const wxString& path)
+/*static*/
+wxString wxDynamicLibrary::GetPluginsDirectory()
 {
-    wxNode *node = m_loaded.First();
-    wxObject *obj;
-
-    while (node) {
-        obj = ((wxLibrary *)node->Data())->CreateObject(path);
-        if (obj)
-            return obj;
+#ifdef __UNIX__
+    wxString format = wxGetInstallPrefix();
+    wxString dir;
+    format << wxFILE_SEP_PATH
+           << wxT("lib") << wxFILE_SEP_PATH
+           << wxT("wx") << wxFILE_SEP_PATH
+#if (wxMINOR_VERSION % 2) == 0
+           << wxT("%i.%i");
+    dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
+#else
+           << wxT("%i.%i.%i");
+    dir.Printf(format.c_str(),
+               wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
+#endif
+    return dir;
 
-        node = node->Next();
-    }
-    return NULL;
+#else // ! __UNIX__
+    return wxEmptyString;
+#endif
 }
 
+
 #endif // wxUSE_DYNLIB_CLASS