added support for POST method and alternate ports (part of patch 649438)

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

diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp
index 3b2ff4bf0e336f7a232a66d556f32d229e0687ad..65bdd6ddb4be81d868ec80cfec62c168e17d6bcd 100644 (file)
--- a/src/common/dynload.cpp
+++ b/src/common/dynload.cpp
@@ -7,7 +7,7 @@
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>
 // Created:      03/12/01
 // RCS-ID:       $Id$
 // Copyright:    (c) 2001 Ron Lee <ron@debian.org>

-// Licence:      wxWindows license
+// Licence:      wxWindows licence

 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__
 /////////////////////////////////////////////////////////////////////////////
 
 #ifdef __GNUG__


@@ -21,145 +21,93 @@
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__
 #include "wx/wxprec.h"
 
 #ifdef __BORLANDC__

-#pragma hdrstop
+    #pragma hdrstop

 #endif
 
 #if wxUSE_DYNAMIC_LOADER
 
 #ifdef __WINDOWS__
 #endif
 
 #if wxUSE_DYNAMIC_LOADER
 
 #ifdef __WINDOWS__

-#include "wx/msw/private.h"
+    #include "wx/msw/private.h"

 #endif
 
 #ifndef WX_PRECOMP
 #endif
 
 #ifndef WX_PRECOMP

-#include "wx/log.h"
-#include "wx/intl.h"
+    #include "wx/log.h"
+    #include "wx/intl.h"
+    #include "wx/hash.h"

 #endif
 
 #endif
 

-#include "wx/dynload.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  // __VMS
-
-#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;
-    return ( shl_findsym(&handle, name.mb_str(), TYPE_UNDEFINED, &sym) == 0 )
-           ? sym : 0;
-}
-
-#elif defined(__DARWIN__)
-
-    // Porting notes:
-    //   The dlopen port is a port from dl_next.xs by Anno Siegel.
-    //   dl_next.xs is itself a port from dl_dlopen.xs by Paul Marquess.
-    //   The method used here is just to supply the sun style dlopen etc.
-    //   functions in terms of Darwin NS*.
-
-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
+#include "wx/filename.h"        // for SplitPath()
+#include "wx/strconv.h"

 
 

-#ifdef __WIN32__
-
-#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(__WXMAC__)
-#define wxDllClose(handle)              CloseConnection(&handle)
-#else
-#error "Don't know how to load shared libraries on this platform."
+#include "wx/dynload.h"
+#include "wx/module.h"
+
+#if defined(__DARWIN__)
+/* Porting notes:
+ *   The dlopen port is a port from dl_next.xs by Anno Siegel.
+ *   dl_next.xs is itself a port from dl_dlopen.xs by Paul Marquess.
+ *   The method used here is just to supply the sun style dlopen etc.
+ *   functions in terms of Darwin NS*.
+ */
+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);

 #endif
 
 #endif
 

-

 // ============================================================================
 // implementation
 // ============================================================================
 
 // ---------------------------------------------------------------------------
 // ============================================================================
 // implementation
 // ============================================================================
 
 // ---------------------------------------------------------------------------

-// wxDllLoader   (all these methods are static)
+// wxDynamicLibrary

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

+//FIXME:  This class isn't really common at all, it should be moved into
+//        platform dependent files.

 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)

-const wxString wxDllLoader::ms_dllext( _T(".dll") );
+    const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");

 #elif defined(__UNIX__)
 #elif defined(__UNIX__)

-#if defined(__HPUX__)
-const wxString wxDllLoader::ms_dllext( _T(".sl") );
-#else
-const wxString wxDllLoader::ms_dllext( _T(".so") );
-#endif
+    #if defined(__HPUX__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+    #else
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
+    #endif

 #endif
 
 #endif
 

-wxDllType wxDllLoader::GetProgramHandle()
+wxDllType wxDynamicLibrary::GetProgramHandle()

 {
 #if defined( HAVE_DLOPEN ) && !defined(__EMX__)
 {
 #if defined( HAVE_DLOPEN ) && !defined(__EMX__)

-   // obtain handle for main program
-   return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
+   return dlopen(0, RTLD_LAZY);

 #elif defined (HAVE_SHL_LOAD)
 #elif defined (HAVE_SHL_LOAD)

-   // shl_findsymbol with NULL handle looks up in main program
-   return 0;
+   return PROG_HANDLE;

 #else
    wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));
    return 0;
 #endif
 }
 
 #else
    wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));
    return 0;
 #endif
 }
 

-wxDllType wxDllLoader::LoadLibrary(const wxString &name)
+bool wxDynamicLibrary::Load(wxString libname, int flags)

 {
 {

-    wxString    libname( name + wxDllLoader::GetDllExt() );
-    wxDllType   handle;
+    wxASSERT_MSG(m_handle == 0, _T("Library already loaded."));
+
+    // add the proper extension for the DLL ourselves unless told not to
+    if ( !(flags & wxDL_VERBATIM) )
+    {
+        // and also check that the libname doesn't already have it
+        wxString ext;
+        wxFileName::SplitPath(libname, NULL, NULL, &ext);
+        if ( ext.empty() )
+        {
+            libname += GetDllExt();
+        }
+    }

 
 

-#if defined(__WXMAC__) && !defined(__UNIX__)
+    // different ways to load a shared library
+    //
+    // FIXME: should go to the platform-specific files!
+#if defined(__WXMAC__) && !defined(__DARWIN__)

     FSSpec      myFSSpec;
     Ptr         myMainAddr;
     Str255      myErrName;
     FSSpec      myFSSpec;
     Ptr         myMainAddr;
     Str255      myErrName;


@@ -171,7 +119,7 @@ wxDllType wxDllLoader::LoadLibrary(const wxString &name)
                          kCFragGoesToEOF,
                          "\p",
                          kPrivateCFragCopy,
                          kCFragGoesToEOF,
                          "\p",
                          kPrivateCFragCopy,

-                         &handle,
+                         &m_handle,

                          &myMainAddr,
                          myErrName ) != noErr )
     {
                          &myMainAddr,
                          myErrName ) != noErr )
     {


@@ -179,69 +127,170 @@ wxDllType wxDllLoader::LoadLibrary(const wxString &name)
         wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
                        libname.c_str(),
                        (char*)myErrName );
         wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
                        libname.c_str(),
                        (char*)myErrName );

-        handle = 0;
+        m_handle = 0;

     }
 
 #elif defined(__WXPM__) || defined(__EMX__)
     }
 
 #elif defined(__WXPM__) || defined(__EMX__)

-    char        zError[256] = "";
-    wxDllOpen(zError, libname, handle);
+    char    err[256] = "";
+    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);
+
+#elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
+
+#if defined(__VMS) || defined(__DARWIN__)
+    m_handle = dlopen(libname.c_str(), 0);  // The second parameter is ignored
+#else // !__VMS  && !__DARWIN__
+    int rtldFlags = 0;
+
+    if ( flags & wxDL_LAZY )
+    {
+        wxASSERT_MSG( (flags & wxDL_NOW) == 0,
+                      _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
+#ifdef RTLD_LAZY
+        rtldFlags |= RTLD_LAZY;

 #else
 #else

-    handle = wxDllOpen(libname);
+        wxLogDebug(_T("wxDL_LAZY is not supported on this platform"));

 #endif
 #endif

-    if ( !handle )
+    }
+    else if ( flags & wxDL_NOW )
+    {
+#ifdef RTLD_NOW
+        rtldFlags |= RTLD_NOW;
+#else
+        wxLogDebug(_T("wxDL_NOW is not supported on this platform"));
+#endif
+    }
+
+    if ( flags & wxDL_GLOBAL )
+    {
+#ifdef RTLD_GLOBAL
+        rtldFlags |= RTLD_GLOBAL;
+#else
+        wxLogDebug(_T("RTLD_GLOBAL is not supported on this platform."));
+#endif
+    }
+
+    m_handle = dlopen(libname.fn_str(), rtldFlags);
+#endif  // __VMS || __DARWIN__ ?
+
+#elif defined(HAVE_SHL_LOAD)
+    int shlFlags = 0;
+
+    if( flags & wxDL_LAZY )
+    {
+        wxASSERT_MSG( (flags & wxDL_NOW) == 0,
+                      _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
+        shlFlags |= BIND_DEFERRED;
+    }
+    else if( flags & wxDL_NOW )
+    {
+        shlFlags |= BIND_IMMEDIATE;
+    }
+    m_handle = shl_load(libname.fn_str(), BIND_DEFERRED, 0);
+
+#elif defined(__WINDOWS__)
+    m_handle = ::LoadLibrary(libname.c_str());
+#else
+    #error  "runtime shared lib support not implemented on this platform"
+#endif
+
+    if ( m_handle == 0 )

     {
         wxString msg(_("Failed to load shared library '%s'"));
     {
         wxString msg(_("Failed to load shared library '%s'"));

-#ifdef HAVE_DLERROR
-        const wxChar  *err = dlerror();
+#if defined(HAVE_DLERROR) && !defined(__EMX__)
+
+#if wxUSE_UNICODE
+        wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
+        const wxChar *err = buffer;
+#else
+        const wxChar *err = dlerror();
+#endif
+

         if( err )
             wxLogError( msg, err );
 #else
         wxLogSysError( msg, libname.c_str() );
 #endif
     }
         if( err )
             wxLogError( msg, err );
 #else
         wxLogSysError( msg, libname.c_str() );
 #endif
     }

-    return handle;
+
+    return IsLoaded();

 }
 
 }
 

-void wxDllLoader::UnloadLibrary(wxDllType handle)
+void wxDynamicLibrary::Unload()

 {
 {

-   wxDllClose(handle);
+    if( IsLoaded() )
+    {
+#if defined(__WXPM__) || defined(__EMX__)
+        DosFreeModule( m_handle );
+#elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
+        dlclose( m_handle );
+#elif defined(HAVE_SHL_LOAD)
+        shl_unload( m_handle );
+#elif defined(__WINDOWS__)
+        ::FreeLibrary( m_handle );
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+        CloseConnection( (CFragConnectionID*) &m_handle );
+#else
+#error  "runtime shared lib support not implemented"
+#endif
+        m_handle = 0;
+    }

 }
 
 }
 

-void *wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *success)
+void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const

 {
 {

+    wxCHECK_MSG( IsLoaded(), NULL,
+                 _T("Can't load symbol from unloaded library") );
+

     bool     failed = FALSE;
     void    *symbol = 0;
 
     bool     failed = FALSE;
     void    *symbol = 0;
 

-#if defined(__WXMAC__) && !defined(__UNIX__)
+#if defined(__WXMAC__) && !defined(__DARWIN__)

     Ptr                 symAddress;
     CFragSymbolClass    symClass;
     Str255              symName;
 #if TARGET_CARBON
     c2pstrcpy( (StringPtr) symName, name );
 #else
     Ptr                 symAddress;
     CFragSymbolClass    symClass;
     Str255              symName;
 #if TARGET_CARBON
     c2pstrcpy( (StringPtr) symName, name );
 #else

-    strcpy( (char *) symName, name );
-    c2pstr( (char *) symName );
+    strcpy( (char *)symName, name );
+    c2pstr( (char *)symName );

 #endif
     if( FindSymbol( dllHandle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 
 #elif defined(__WXPM__) || defined(__EMX__)
 #endif
     if( FindSymbol( dllHandle, symName, &symAddress, &symClass ) == noErr )
         symbol = (void *)symAddress;
 
 #elif defined(__WXPM__) || defined(__EMX__)

-    wxDllGetSymbol(dllHandle, symbol);
-#else
+    DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
+
+#elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
+    symbol = dlsym( m_handle, name.fn_str() );

 
 

-    // mb_str() is necessary in Unicode build
-    symbol = wxDllGetSymbol(dllHandle, name.mb_str());
+#elif defined(HAVE_SHL_LOAD)
+    // use local variable since shl_findsym modifies the handle argument
+    // to indicate where the symbol was found (GD)
+    wxDllType the_handle = m_handle;
+    if( shl_findsym( &the_handle, name.fn_str(), TYPE_UNDEFINED, &symbol ) != 0 )
+        symbol = 0;
+
+#elif defined(__WINDOWS__)
+    symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() );
+
+#else
+#error  "runtime shared lib support not implemented"

 #endif
 
     if ( !symbol )
     {
 #endif
 
     if ( !symbol )
     {

-        wxString msg(_("wxDllLoader failed to GetSymbol '%s'"));
-#ifdef HAVE_DLERROR
+#if defined(HAVE_DLERROR) && !defined(__EMX__)
+
+#if wxUSE_UNICODE
+        wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() );
+        const wxChar *err = buffer;
+#else

         const wxChar *err = dlerror();
         const wxChar *err = dlerror();

+#endif
+

         if( err )
         {
         if( err )
         {

-            failed = TRUE;
-            wxLogError( msg, err );
+            wxLogError(wxT("%s"), err);

         }
 #else
         failed = TRUE;
         }
 #else
         failed = TRUE;


@@ -257,46 +306,88 @@ void *wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *su
 
 
 // ---------------------------------------------------------------------------
 
 
 // ---------------------------------------------------------------------------

-// wxDLManifestEntry
+// wxPluginLibrary

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

-wxDLImports  wxDLManifestEntry::ms_classes(wxKEY_STRING);
+wxDLImports*  wxPluginLibrary::ms_classes = NULL;
+
+class wxPluginLibraryModule : public wxModule
+{
+public:
+    wxPluginLibraryModule() { }
+
+    // TODO: create ms_classes on demand, why always preallocate it?
+    virtual bool OnInit()
+    {
+        wxPluginLibrary::ms_classes = new wxDLImports(wxKEY_STRING);
+        wxPluginManager::CreateManifest();
+        return TRUE;
+    }

 
 

-wxDLManifestEntry::wxDLManifestEntry( const wxString &libname )
-        : m_before(wxClassInfo::sm_first)
-        , m_handle(wxDllLoader::LoadLibrary( libname ))
-        , m_after(wxClassInfo::sm_first)
-        , m_linkcount(1)
+    virtual void OnExit()
+    {
+        delete wxPluginLibrary::ms_classes;
+        wxPluginLibrary::ms_classes = NULL;
+        wxPluginManager::ClearManifest();
+    }
+
+private:
+    DECLARE_DYNAMIC_CLASS(wxPluginLibraryModule )
+};
+
+IMPLEMENT_DYNAMIC_CLASS(wxPluginLibraryModule, wxModule)
+
+
+wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
+        : m_linkcount(1)

         , m_objcount(0)
 {
         , m_objcount(0)
 {

+    m_before = wxClassInfo::sm_first;
+    Load( libname, flags );
+    m_after = wxClassInfo::sm_first;
+

     if( m_handle != 0 )
     {
         UpdateClassInfo();
         RegisterModules();
     }
     else
     if( m_handle != 0 )
     {
         UpdateClassInfo();
         RegisterModules();
     }
     else

-        --m_linkcount;      // Flag us for deletion
+    {
+        // Flag us for deletion
+        --m_linkcount;
+    }

 }
 
 }
 

-wxDLManifestEntry::~wxDLManifestEntry()
+wxPluginLibrary::~wxPluginLibrary()

 {
     if( m_handle != 0 )
     {
         UnregisterModules();
         RestoreClassInfo();
 {
     if( m_handle != 0 )
     {
         UnregisterModules();
         RestoreClassInfo();

-        wxDllLoader::UnloadLibrary(m_handle);

     }
 }
 
     }
 }
 

-bool wxDLManifestEntry::UnrefLib()
+wxPluginLibrary *wxPluginLibrary::RefLib()
+{
+    wxCHECK_MSG( m_linkcount > 0, NULL,
+                 _T("Library had been already deleted!") );
+
+    ++m_linkcount;
+    return this;
+}
+
+bool wxPluginLibrary::UnrefLib()

 {
 {

-    wxASSERT_MSG( m_objcount == 0, _T("Library unloaded before all objects were destroyed") );
-    if( m_linkcount == 0 || --m_linkcount == 0 )
+    wxASSERT_MSG( m_objcount == 0,
+                  _T("Library unloaded before all objects were destroyed") );
+
+    if ( --m_linkcount == 0 )

     {
         delete this;
         return TRUE;
     }
     {
         delete this;
         return TRUE;
     }

+

     return FALSE;
 }
 
     return FALSE;
 }
 


@@ -304,7 +395,7 @@ bool wxDLManifestEntry::UnrefLib()
 // Private methods
 // ------------------------
 
 // Private methods
 // ------------------------
 

-void wxDLManifestEntry::UpdateClassInfo()
+void wxPluginLibrary::UpdateClassInfo()

 {
     wxClassInfo     *info;
     wxHashTable     *t = wxClassInfo::sm_classTable;
 {
     wxClassInfo     *info;
     wxHashTable     *t = wxClassInfo::sm_classTable;


@@ -327,9 +418,7 @@ void wxDLManifestEntry::UpdateClassInfo()
 
             // Hash all the class names into a local table too so
             // we can quickly find the entry they correspond to.
 
             // Hash all the class names into a local table too so
             // we can quickly find the entry they correspond to.

-
-            if( ms_classes.Get(info->m_className) == 0 )
-                ms_classes.Put(info->m_className, (wxObject *) this);
+            (*ms_classes)[info->m_className] = this;

         }
     }
 
         }
     }
 


@@ -342,14 +431,14 @@ void wxDLManifestEntry::UpdateClassInfo()
     }
 }
 
     }
 }
 

-void wxDLManifestEntry::RestoreClassInfo()
+void wxPluginLibrary::RestoreClassInfo()

 {
     wxClassInfo *info;
 
     for(info = m_after; info != m_before; info = info->m_next)
     {
         wxClassInfo::sm_classTable->Delete(info->m_className);
 {
     wxClassInfo *info;
 
     for(info = m_after; info != m_before; info = info->m_next)
     {
         wxClassInfo::sm_classTable->Delete(info->m_className);

-        ms_classes.Delete(info->m_className);
+        ms_classes->erase(ms_classes->find(info->m_className));

     }
 
     if( wxClassInfo::sm_first == m_after )
     }
 
     if( wxClassInfo::sm_first == m_after )


@@ -359,13 +448,13 @@ void wxDLManifestEntry::RestoreClassInfo()
         info = wxClassInfo::sm_first;
         while( info->m_next && info->m_next != m_after ) info = info->m_next;
 
         info = wxClassInfo::sm_first;
         while( info->m_next && info->m_next != m_after ) info = info->m_next;
 

-        wxASSERT_MSG( info, _T("ClassInfo from wxDynamicLibrary not found on purge"))
+        wxASSERT_MSG( info, _T("ClassInfo from wxPluginLibrary not found on purge"));

 
         info->m_next = m_before;
     }
 }
 
 
         info->m_next = m_before;
     }
 }
 

-void wxDLManifestEntry::RegisterModules()
+void wxPluginLibrary::RegisterModules()

 {
     // Plugin libraries might have wxModules, Register and initialise them if
     // they do.
 {
     // Plugin libraries might have wxModules, Register and initialise them if
     // they do.


@@ -378,7 +467,7 @@ void wxDLManifestEntry::RegisterModules()
     wxASSERT_MSG( m_linkcount == 1,
                   _T("RegisterModules should only be called for the first load") );
 
     wxASSERT_MSG( m_linkcount == 1,
                   _T("RegisterModules should only be called for the first load") );
 

-    for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
+    for ( wxClassInfo *info = m_after; info != m_before; info = info->m_next)

     {
         if( info->IsKindOf(CLASSINFO(wxModule)) )
         {
     {
         if( info->IsKindOf(CLASSINFO(wxModule)) )
         {


@@ -386,18 +475,20 @@ void wxDLManifestEntry::RegisterModules()
 
             wxASSERT_MSG( m, _T("wxDynamicCast of wxModule failed") );
 
 
             wxASSERT_MSG( m, _T("wxDynamicCast of wxModule failed") );
 

-            m_wxmodules.Append(m);
+            m_wxmodules.push_back(m);

             wxModule::RegisterModule(m);
         }
     }
 
     // FIXME: Likewise this is (well was) very similar to InitializeModules()
 
             wxModule::RegisterModule(m);
         }
     }
 
     // FIXME: Likewise this is (well was) very similar to InitializeModules()
 

-    for(wxModuleList::Node *node = m_wxmodules.GetFirst(); node; node->GetNext())
+    for ( wxModuleList::iterator it = m_wxmodules.begin();
+          it != m_wxmodules.end();
+          ++it)

     {
     {

-        if( !node->GetData()->Init() )
+        if( !(*it)->Init() )

         {
         {

-            wxLogDebug(_T("wxModule::Init() failed for wxDynamicLibrary"));
+            wxLogDebug(_T("wxModule::Init() failed for wxPluginLibrary"));

 
             // XXX: Watch this, a different hash implementation might break it,
             //      a good hash implementation would let us fix it though.
 
             // XXX: Watch this, a different hash implementation might break it,
             //      a good hash implementation would let us fix it though.


@@ -406,13 +497,14 @@ void wxDLManifestEntry::RegisterModules()
             // let the dtor Exit the rest on shutdown, (which we'll initiate
             // shortly).
 
             // let the dtor Exit the rest on shutdown, (which we'll initiate
             // shortly).
 

-            wxModuleList::Node *oldNode = 0;
+            wxModuleList::iterator oldNode = m_wxmodules.end();

             do {
             do {

-                node = node->GetNext();
-                delete oldNode;
-                wxModule::UnregisterModule( node->GetData() );
-                oldNode = node;
-            } while( node );
+                ++it;
+                if( oldNode != m_wxmodules.end() )
+                    m_wxmodules.erase(oldNode);
+                wxModule::UnregisterModule( *it );
+                oldNode = it;
+            } while( it != m_wxmodules.end() );

 
             --m_linkcount;     // Flag us for deletion
             break;
 
             --m_linkcount;     // Flag us for deletion
             break;


@@ -420,192 +512,217 @@ void wxDLManifestEntry::RegisterModules()
     }
 }
 
     }
 }
 

-void wxDLManifestEntry::UnregisterModules()
+void wxPluginLibrary::UnregisterModules()

 {
 {

-    wxModuleList::Node  *node;
+    wxModuleList::iterator it;

 
 

-    for(node = m_wxmodules.GetFirst(); node; node->GetNext())
-        node->GetData()->Exit();
+    for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
+        (*it)->Exit();

 
 

-    for(node = m_wxmodules.GetFirst(); node; node->GetNext())
-        wxModule::UnregisterModule( node->GetData() );
+    for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
+        wxModule::UnregisterModule( *it );

 
 

-    m_wxmodules.DeleteContents(TRUE);
+    WX_CLEAR_LIST(wxModuleList, m_wxmodules);

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

-// wxDynamicLibrary
+// wxPluginManager

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

-wxDLManifest   wxDynamicLibrary::ms_manifest(wxKEY_STRING);
+wxDLManifest*   wxPluginManager::ms_manifest = NULL;

 
 // ------------------------
 // Static accessors
 // ------------------------
 
 
 // ------------------------
 // Static accessors
 // ------------------------
 

-wxDLManifestEntry *wxDynamicLibrary::Link(const wxString &libname)
+wxPluginLibrary *
+wxPluginManager::LoadLibrary(const wxString &libname, int flags)

 {
 {

-    wxDLManifestEntry *entry = (wxDLManifestEntry*) ms_manifest.Get(libname);
+    wxString realname(libname);
+
+    if( !(flags & wxDL_VERBATIM) )
+        realname += wxDynamicLibrary::GetDllExt();

 
 

-    if( entry )
+    wxPluginLibrary *entry;
+
+    if ( flags & wxDL_NOSHARE )
+    {
+        entry = NULL;
+    }
+    else

     {
     {

+        entry = FindByName(realname);
+    }
+
+    if ( entry )
+    {
+        wxLogTrace(_T("dll"),
+                   _T("LoadLibrary(%s): already loaded."), realname.c_str());
+

         entry->RefLib();
     }
     else
     {
         entry->RefLib();
     }
     else
     {

-        entry = new wxDLManifestEntry( libname );
+        entry = new wxPluginLibrary( libname, flags );

 
 

-        if( entry->IsLoaded() )
+        if ( entry->IsLoaded() )

         {
         {

-            ms_manifest.Put(libname, (wxObject*) entry);
+            (*ms_manifest)[realname] = entry;
+
+            wxLogTrace(_T("dll"),
+                       _T("LoadLibrary(%s): loaded ok."), realname.c_str());
+

         }
         else
         {
         }
         else
         {

-            wxCHECK_MSG( entry->UnrefLib(), 0,
-                         _T("Currently linked library is, ..not loaded??") );
-            entry = 0;
+            wxLogTrace(_T("dll"),
+                       _T("LoadLibrary(%s): failed to load."), realname.c_str());
+
+            // we have created entry just above
+            if ( !entry->UnrefLib() )
+            {
+                // ... so UnrefLib() is supposed to delete it
+                wxFAIL_MSG( _T("Currently linked library is not loaded?") );
+            }
+
+            entry = NULL;

         }
     }
         }
     }

+

     return entry;
 }
 
     return entry;
 }
 

-bool wxDynamicLibrary::Unlink(const wxString &libname)
+bool wxPluginManager::UnloadLibrary(const wxString& libname)

 {
 {

-    wxDLManifestEntry *entry = (wxDLManifestEntry*) ms_manifest.Get(libname);
+    wxString realname = libname;

 
 

-    if( entry )
-        return entry->UnrefLib();
+    wxPluginLibrary *entry = FindByName(realname);

 
 

-    wxLogDebug(_T("Attempt to Unlink library '%s' (which is not linked)."), libname.c_str());
-    return 0;
-}
+    if ( !entry )
+    {
+        realname += wxDynamicLibrary::GetDllExt();

 
 

-// ------------------------
-// Class implementation
-// ------------------------
+        entry = FindByName(realname);
+    }

 
 

-wxDynamicLibrary::wxDynamicLibrary(const wxString &libname)
-{
-    m_entry = (wxDLManifestEntry*) ms_manifest.Get(libname);
+    if ( !entry )
+    {
+        wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."),
+                   libname.c_str());
+
+        return FALSE;
+    }

 
 

-    if( m_entry != 0 )
+    wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str());
+
+    if ( !entry->UnrefLib() )

     {
     {

-        m_entry->RefLib();
+        // not really unloaded yet
+        return FALSE;

     }
     }

-    else
+
+    ms_manifest->erase(ms_manifest->find(realname));
+
+    return TRUE;
+}
+
+#if WXWIN_COMPATIBILITY_2_2
+wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
+{
+    for ( wxDLManifest::iterator i = ms_manifest->begin();
+          i != ms_manifest->end();
+          ++i )

     {
     {

-        m_entry = new wxDLManifestEntry( libname );
-        ms_manifest.Put(libname, (wxObject*) m_entry);
+        wxPluginLibrary * const lib = i->second;

 
 

-        wxASSERT_MSG( m_entry != 0, _T("Failed to create manifest entry") );
+        if ( lib->GetLibHandle() == handle )
+            return lib;

     }
     }

+
+    return NULL;

 }
 }

+#endif // WXWIN_COMPATIBILITY_2_2
+
+// ------------------------
+// Class implementation
+// ------------------------

 
 

-wxDynamicLibrary::~wxDynamicLibrary()
+bool wxPluginManager::Load(const wxString &libname, int flags)

 {
 {

-    wxNode  *node;
-    ms_manifest.BeginFind();
+    m_entry = wxPluginManager::LoadLibrary(libname, flags);

 
 

-    // It's either this or store the name of the lib just to do this.
+    return IsLoaded();
+}
+
+void wxPluginManager::Unload()
+{
+    wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") );

 
 

-    for(node = ms_manifest.Next(); node; node = ms_manifest.Next())
-        if( (wxDLManifestEntry*)node->GetData() == m_entry )
+    for ( wxDLManifest::iterator i = ms_manifest->begin();
+          i != ms_manifest->end();
+          ++i )
+    {
+        if ( i->second == m_entry )
+        {
+            ms_manifest->erase(i);

             break;
             break;

+        }
+    }

 
 

-    if( m_entry && m_entry->UnrefLib() )
-        delete node;
-}
+    m_entry->UnrefLib();

 
 

+    m_entry = NULL;
+}

 
 

-#ifdef __DARWIN__

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

-// For Darwin/Mac OS X
-//   supply the sun style dlopen functions in terms of Darwin NS*
+// wxDllLoader   (all these methods are static)

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

-extern "C" {
-#import <mach-o/dyld.h>
-};
+#if WXWIN_COMPATIBILITY_2_2

 
 

-enum dyldErrorSource
+wxDllType wxDllLoader::LoadLibrary(const wxString &name, bool *success)

 {
 {

-    OFImage,
-};
+    wxPluginLibrary *p = wxPluginManager::LoadLibrary
+                         (
+                            name,
+                            wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE
+                         );

 
 

-static char dl_last_error[1024];
+    if ( success )
+        *success = p != NULL;

 
 

-static
-void TranslateError(const char *path, enum dyldErrorSource type, int number)
-{
-    unsigned int index;
-    static char *OFIErrorStrings[] =
-    {
-       "%s(%d): Object Image Load Failure\n",
-       "%s(%d): Object Image Load Success\n",
-       "%s(%d): Not an recognisable object file\n",
-       "%s(%d): No valid architecture\n",
-       "%s(%d): Object image has an invalid format\n",
-       "%s(%d): Invalid access (permissions?)\n",
-       "%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n",
-    };
-#define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
-
-    switch (type)
-    {
-     case OFImage:
-        index = number;
-        if (index > NUM_OFI_ERRORS - 1) {
-            index = NUM_OFI_ERRORS - 1;
-        }
-        sprintf(dl_last_error, OFIErrorStrings[index], path, number);
-        break;
-        
-     default:
-        sprintf(dl_last_error, "%s(%d): Totally unknown error type %d\n",
-                path, number, type);
-        break;
-    }
+    return p ? p->GetLibHandle() : 0;

 }
 
 }
 

-const char *dlerror()
+void wxDllLoader::UnloadLibrary(wxDllType handle)

 {
 {

-    return dl_last_error;
+    wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(handle);
+
+    wxCHECK_RET( p, _T("Unloading a library not loaded with wxDllLoader?") );
+
+    p->UnrefLib();

 }
 }

-void *dlopen(const char *path, int mode /* mode is ignored */)
+
+void *
+wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *success)

 {
 {

-    int                 dyld_result;
-    NSObjectFileImage   ofile;
-    NSModule            handle = 0;
+    wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(dllHandle);

 
 

-    dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
-    if(dyld_result != NSObjectFileImageSuccess)
-    {
-       TranslateError(path, OFImage, dyld_result);
-    }
-    else
+    if ( !p )

     {
     {

-       // NSLinkModule will cause the run to abort on any link error's
-       // not very friendly but the error recovery functionality is limited.
-       handle = NSLinkModule(ofile, path, TRUE);
-    }
+        wxFAIL_MSG( _T("Using a library not loaded with wxDllLoader?") );

 
 

-    return handle;
-}
+        if ( success )
+            *success = FALSE;

 
 

-int dlclose(void *handle) /* stub only */
-{
-    return 0;
-}
+        return NULL;
+    }

 
 

-void *dlsym(void *handle, const char *symbol)
-{
-    return NSIsSymbolNameDefined(symbol)
-            ? NSAddressOfSymbol( NSLookupAndBindSymbol(symbol) )
-            : 0 ;
+    return p->GetSymbol(name, success);

 }
 
 }
 

-#endif // __DARWIN__
+#endif  // WXWIN_COMPATIBILITY_2_2
+

 #endif  // wxUSE_DYNAMIC_LOADER
 
 #endif  // wxUSE_DYNAMIC_LOADER
 

-// vi:sts=4:sw=4:et