Commited latest SciTech changes into CVS. This includes updates to the

[wxWidgets.git] / src / common / dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 906f7d83a35518df85c908a21d618bd042faed69..5c93399eee466932826be97f12f5e5d33360eb31 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -9,26 +9,100 @@
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 
 // Licence:     wxWindows license
 /////////////////////////////////////////////////////////////////////////////
 

+// ============================================================================
+// declarations
+// ============================================================================
+
+// ----------------------------------------------------------------------------
+// headers
+// ----------------------------------------------------------------------------
+

 #ifdef __GNUG__
 #ifdef __GNUG__

-#pragma implementation "dynlib.h"
+#   pragma implementation "dynlib.h"

 #endif
 
 #endif
 

-#include <wx/dynlib.h>
-#include <wx/filefn.h>
-#include <wx/list.h>
-#include <wx/string.h>
+#include  "wx/wxprec.h"

 
 

-// ---------------------------------------------------------------------------
-// System dependent include
-// ---------------------------------------------------------------------------
+#ifdef __BORLANDC__
+  #pragma hdrstop
+#endif

 
 

-#ifdef __UNIX__ 
-#include <dlfcn.h>
+#if wxUSE_DYNLIB_CLASS
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h"

 #endif
 
 #endif
 

-#ifdef __WINDOWS__
-#include <windows.h>
+#include "wx/dynlib.h"
+#include "wx/filefn.h"
+#include "wx/intl.h"
+#include "wx/log.h"
+#include "wx/tokenzr.h"
+
+// ----------------------------------------------------------------------------
+// conditional compilation
+// ----------------------------------------------------------------------------
+
+#if defined(__WXPM__) || defined(__EMX__)
+#  define INCL_DOS
+#  include <os2.h>
+#  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)
+    // note about dlopen() flags: we use RTLD_NOW to have more Windows-like
+    // behaviour (Win won't let you load a library with missing symbols) and
+    // RTLD_GLOBAL because it is needed sometimes and probably doesn't hurt
+    // otherwise. On True64-Unix RTLD_GLOBAL is not allowed and on VMS the
+    // second argument on dlopen is ignored.
+#ifdef __VMS
+# define wxDllOpen(lib)                dlopen(lib.fn_str(), 0 )
+#elif defined( __osf__ )
+# define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY )
+#else
+# define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY | RTLD_GLOBAL)
+#endif
+#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)
+#   define wxDllClose                    shl_unload
+
+    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(__APPLE__) && defined(__UNIX__)
+void *dlopen(const char *path, int mode /* mode is ignored */);
+void *dlsym(void *handle, const char *symbol);
+int   dlclose(void *handle);
+const char *dlerror(void);
+
+#   define wxDllOpen(lib)                dlopen(lib.fn_str(), 0)
+#   define wxDllGetSymbol(handle, name)  dlsym(handle, name)
+#   define wxDllClose                    dlclose
+#elif defined(__WINDOWS__)
+    // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
+#   ifdef __WIN32__
+#ifdef _UNICODE
+#      define wxDllOpen(lib)                  ::LoadLibraryExW(lib, 0, 0)
+#else
+#      define wxDllOpen(lib)                  ::LoadLibraryExA(lib, 0, 0)

 #endif
 #endif

+#   else   // Win16
+#      define wxDllOpen(lib)                  ::LoadLibrary(lib)
+#   endif  // Win32/16
+#   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
+#   define wxDllClose                      ::FreeLibrary
+#elif defined(__WXMAC__)
+#   define wxDllClose(handle)               CloseConnection(&handle)
+#else
+#   error "Don't know how to load shared libraries on this platform."
+#endif // OS

 
 // ---------------------------------------------------------------------------
 // Global variables
 
 // ---------------------------------------------------------------------------
 // Global variables


@@ -36,209 +110,325 @@
 
 wxLibraries wxTheLibraries;
 
 
 wxLibraries wxTheLibraries;
 

+// ============================================================================
+// 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;
+    fullname << basename << wxDllLoader::GetDllExt();
+
+    return fullname;
+}
+

 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------

-// wxLibrary (one instance per dynamic library
+// wxLibrary (one instance per dynamic library)

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-wxLibrary::wxLibrary(void *handle)
+wxLibrary::wxLibrary(wxDllType handle)

 {
 {

-  typedef wxClassLibrary *(*t_get_list)(void);
-  t_get_list get_list;
+    typedef wxClassInfo *(*t_get_first)(void);
+    t_get_first get_first;

 
 

-  m_handle = handle;
+    m_handle = handle;

 
 

-  get_list = (t_get_list)GetSymbol("GetClassList");
-  m_liblist = (*get_list)();
+    // 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());

 }
 
 wxLibrary::~wxLibrary()
 {
 }
 
 wxLibrary::~wxLibrary()
 {

-  if (m_handle) {
-    typedef void (*t_free_list)(wxClassLibrary *);
-    t_free_list free_list;
+    if ( m_handle )
+    {
+        wxDllClose(m_handle);
+    }
+}

 
 

-    free_list = (t_free_list) GetSymbol("FreeClassList");
-    if (free_list != NULL)
-      free_list(m_liblist);
-    else
-      delete m_liblist;
+wxObject *wxLibrary::CreateObject(const wxString& name)
+{
+    wxClassInfo *info = (wxClassInfo *)classTable.Get(name);

 
 

-#ifdef __UNIX__
-    dlclose(m_handle);
-#endif
-#ifdef __WINDOWS__
-    FreeLibrary((HMODULE)m_handle);
-#endif
-  }
+    if (!info)
+        return NULL;
+
+    return info->CreateObject();

 }
 
 }
 

-wxObject *wxLibrary::CreateObject(const wxString& name)
+void wxLibrary::PrepareClasses(wxClassInfo *first)

 {
 {

-  return m_liblist->CreateObject(name);
+    // Index all class infos by their class name
+    wxClassInfo *info = first;
+    while (info)
+    {
+        if (info->m_className)
+            classTable.Put(info->m_className, (wxObject *)info);
+        info = (wxClassInfo *)info->GetNext();
+    }
+
+    // Set base pointers for each wxClassInfo
+    info = first;
+    while (info)
+    {
+        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;
+    }

 }
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 {
 }
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 {

-#ifdef __UNIX__
-  return dlsym(m_handle, WXSTRINGCAST symbname);
-#endif
-#ifdef __WINDOWS__
-  return GetProcAddress(m_handle, WXSTRINGCAST symbname);
-#endif
-  return NULL;
+   return wxDllLoader::GetSymbol(m_handle, symbname);

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// wxLibraries (only one instance should normally exist)
+// wxDllLoader

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-wxLibraries::wxLibraries()
+/* 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;

 }
 
 }
 

-wxLibraries::~wxLibraries()
+/* static */
+wxDllType
+wxDllLoader::GetProgramHandle(void)

 {
 {

-  wxNode *node = m_loaded.First();
-
-  while (node) {
-    wxLibrary *lib = (wxLibrary *)node->Data();
-    delete lib;
-
-    node = node->Next();
-  }
+#if defined( HAVE_DLOPEN ) && !defined(__EMX__)
+   // 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

 }
 
 }
 

-wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
+/* static */
+wxDllType
+wxDllLoader::LoadLibrary(const wxString & libname, bool *success)

 {
 {

-  wxString lib_name = name;
-  wxNode *node;
-  wxLibrary *lib;
-
-  if ( (node = m_loaded.Find(name.GetData())) )
-    return ((wxLibrary *)node->Data());
-
-#ifdef __UNIX__
-  lib_name.Prepend("lib");
-  lib_name += ".so";
-
-  printf("lib_name = %s\n", WXSTRINGCAST lib_name);
+    wxDllType handle;
+
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    FSSpec myFSSpec ;
+    Ptr myMainAddr ;
+    Str255 myErrName ;
+
+    wxMacFilename2FSSpec( libname , &myFSSpec ) ;
+    if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
+                myErrName ) != noErr )
+    {
+        p2cstr( myErrName ) ;
+        wxLogSysError( _("Failed to load shared library '%s' Error '%s'") , libname.c_str() , (char*)myErrName ) ;
+        handle = NULL ;
+    }
+#elif defined(__WXPM__) || defined(__EMX__)
+    char zError[256] = "";
+    wxDllOpen(zError, libname, handle);
+#else // !Mac
+    handle = wxDllOpen(libname);
+#endif // OS
+
+    if ( !handle )
+    {
+        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());
+        }
+    }

 
 

-  void *handle = dlopen(WXSTRINGCAST lib_name, RTLD_LAZY);
+    if ( success )
+    {
+        *success = handle != 0;
+    }

 
 

-  if (!handle)
-    return NULL;
-#endif
-#ifdef __WINDOWS__
-  lib_name += ".dll";
+    return handle;
+}

 
 

-  HMODULE handle = LoadLibrary(lib_name);
-  if (!handle)
-    return NULL;
-#endif
-  lib = new wxLibrary((void *)handle);

 
 

-  m_loaded.Append(name.GetData(), lib);
-  return lib;
+/* static */
+void
+wxDllLoader::UnloadLibrary(wxDllType handle)
+{
+   wxDllClose(handle);

 }
 
 }
 

-wxObject *wxLibraries::CreateObject(const wxString& path)
+/* static */
+void *
+wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)

 {
 {

-  wxNode *node = m_loaded.First();
-  wxObject *obj;
+    void *symbol = NULL;    // return value
+
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    Ptr symAddress ;
+    CFragSymbolClass symClass ;
+    Str255 symName ;
+
+#if TARGET_CARBON
+    c2pstrcpy( (StringPtr) symName , name ) ;
+#else
+    strcpy( (char *) symName , name ) ;
+       c2pstr( (char *) symName ) ;
+#endif

 
 

-  while (node) {
-    obj = ((wxLibrary *)node->Data())->CreateObject(path);
-    if (obj) 
-      return obj;
+    if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
+        symbol = (void *)symAddress ;
+#elif defined( __WXPM__ ) || defined(__EMX__)
+    wxDllGetSymbol(dllHandle, symbol);
+#else
+    // mb_str() is necessary in Unicode build
+    symbol = wxDllGetSymbol(dllHandle, name.mb_str());
+#endif

 
 

-    node = node->Next();
-  }
-  return NULL;
+    if ( !symbol )
+    {
+        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
+                      name.c_str());
+    }
+    return symbol;

 }
 
 // ---------------------------------------------------------------------------
 }
 
 // ---------------------------------------------------------------------------

-// wxClassLibrary (this class is used to access the internal class)
+// wxLibraries (only one instance should normally exist)

 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 

-wxClassLibrary::wxClassLibrary(void)
+wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)

 {
 }
 
 {
 }
 

-wxClassLibrary::~wxClassLibrary(void)
+wxLibraries::~wxLibraries()

 {
 {

-  size_t i;
+    wxNode *node = m_loaded.First();

 
 

-  for (i=0;i<m_list.Count();i++)
-    delete (m_list[i]);
-}
-
-void wxClassLibrary::RegisterClass(wxClassInfo *class_info,
-                                   const wxString& path)
-{
-  wxClassLibInfo *info = new wxClassLibInfo;
+    while (node) {
+        wxLibrary *lib = (wxLibrary *)node->Data();
+        delete lib;

 
 

-  info->class_info = class_info;
-  info->path = path;
-  m_list.Add(info);
+        node = node->Next();
+    }

 }
 
 }
 

-void wxClassLibrary::UnregisterClass(wxClassInfo *class_info)
+wxLibrary *wxLibraries::LoadLibrary(const wxString& name)

 {
 {

-  size_t i = 0;
+    wxNode *node;
+    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())) != NULL)
+        return ((wxLibrary *)node->Data());
+#endif
+    // If DLL shares data, this is necessary.
+    old_sm_first = wxClassInfo::sm_first;
+    wxClassInfo::sm_first = NULL;
+
+    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 << wxT(':') << envLibPath;
+    wxStringTokenizer tokenizer(libPath, wxT(':'));
+    while ( tokenizer.HasMoreToken() )
+    {
+        wxString fullname(tokenizer.NextToken());
+
+        fullname << wxT('/') << libname;
+        if ( wxFileExists(fullname) )
+        {
+            libname = fullname;
+
+            // found the library
+            break;
+        }
+    }
+    //else: not found in the path, leave the name as is (secutiry risk?)
+
+#endif // __UNIX__
+#endif

 
 

-  while (i < m_list.Count()) {
-    if (m_list[i]->class_info == class_info) {
-      delete (m_list[i]);
-      m_list.Remove(i);
-      return;
+    bool success = FALSE;
+    wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);
+    if(success)
+    {
+       lib = new wxLibrary(handle);
+       wxClassInfo::sm_first = old_sm_first;
+       m_loaded.Append(name.GetData(), lib);

     }
     }

-    i++;
-  }
+    else
+       lib = NULL;
+    return lib;

 }
 
 }
 

-bool wxClassLibrary::CreateObjects(const wxString& path,
-                                   wxArrayClassInfo& objs)
+wxObject *wxLibraries::CreateObject(const wxString& path)

 {
 {

-  wxClassLibInfo *info;
-  size_t i = 0;
-
-  while (i < m_list.Count()) {
-    info = m_list[i];
-    if (wxMatchWild(path, info->path))
-      objs.Add(info->class_info);
-    i++;
-  }
-  return (i > 0);
-}
+    wxNode *node = m_loaded.First();
+    wxObject *obj;

 
 

-bool wxClassLibrary::FetchInfos(const wxString& path,
-                                wxArrayClassLibInfo& infos)
-{
-  wxClassLibInfo *info;
-  size_t i = 0;
-
-  while (i < m_list.Count()) {
-    info = m_list[i];
-    if (wxMatchWild(path, info->path)) {
-      wxClassLibInfo *inf = new wxClassLibInfo;
-      *inf = *info;
-      infos.Add(inf);
+    while (node) {
+        obj = ((wxLibrary *)node->Data())->CreateObject(path);
+        if (obj)
+            return obj;
+
+        node = node->Next();

     }
     }

-    i++;
-  }
-  return (i > 0);
+    return NULL;

 }
 
 }
 

-wxObject *wxClassLibrary::CreateObject(const wxString& path)
-{
-  wxClassLibInfo *info;
-  size_t i = 0;
-
-  while (i < m_list.Count()) {
-    info = m_list[i];
-    if (wxMatchWild(path, info->path))
-      return info->class_info->CreateObject();
-    i++;
-  }
-  return NULL;
-}
+#endif // wxUSE_DYNLIB_CLASS