reverted rev 1.26, workarounds for memchecking code no longer needed

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index cc41e9f693e7d6b9d3da0ba2ba6c4ad57381acf5..023ff4fe2a3308cd9e61c6ad6f4722c984d8fe37 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -6,7 +6,7 @@
 // Created:     20/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux
 // Created:     20/07/98
 // RCS-ID:      $Id$
 // Copyright:   (c) Guilhem Lavaux

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

 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================
 /////////////////////////////////////////////////////////////////////////////
 
 // ============================================================================


@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #   pragma implementation "dynlib.h"
 #endif
 
 #   pragma implementation "dynlib.h"
 #endif
 


@@ -37,373 +37,483 @@
 #include "wx/filefn.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 #include "wx/filefn.h"
 #include "wx/intl.h"
 #include "wx/log.h"

-#include "wx/tokenzr.h"
+#include "wx/utils.h"
+#include "wx/filename.h"        // for SplitPath()
+#include "wx/app.h"
+#include "wx/apptrait.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)
-#   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
-#   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(__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)
+#if defined(__WXMAC__)
+    #include "wx/mac/private.h"

 #endif
 #endif

-#   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;

 
 // ============================================================================
 // implementation
 // ============================================================================
 
 
 // ============================================================================
 // 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;
-}
-
-
+#if defined(__DARWIN__)

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

-// wxLibrary (one instance per dynamic library)
+// For Darwin/Mac OS X
+//   supply the sun style dlopen functions in terms of Darwin NS*

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

-wxLibrary::wxLibrary(wxDllType handle)
-{
-    typedef wxClassInfo *(*t_get_first)(void);
-    t_get_first get_first;
+/* 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*.
+ */

 
 

-    m_handle = handle;
+#include <stdio.h>
+#include <mach-o/dyld.h>

 
 

-    // 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());
-}
+static char dl_last_error[1024];

 
 

-wxLibrary::~wxLibrary()
+static
+void TranslateError(const char *path, int number)

 {
 {

-    if ( m_handle )
+    unsigned int index;
+    static char *OFIErrorStrings[] =

     {
     {

-        wxDllClose(m_handle);
+       "%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]))
+
+    index = number;
+    if (index > NUM_OFI_ERRORS - 1) {
+        index = NUM_OFI_ERRORS - 1;

     }
     }

+    sprintf(dl_last_error, OFIErrorStrings[index], path, number);

 }
 
 }
 

-wxObject *wxLibrary::CreateObject(const wxString& name)
+const char *dlerror()

 {
 {

-    wxClassInfo *info = (wxClassInfo *)classTable.Get(name);
-
-    if (!info)
-        return NULL;
-
-    return info->CreateObject();
+    return dl_last_error;

 }
 
 }
 

-void wxLibrary::PrepareClasses(wxClassInfo *first)
+void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)

 {
 {

-    // Index all class infos by their class name
-    wxClassInfo *info = first;
-    while (info)
+    int dyld_result;
+    NSObjectFileImage ofile;
+    NSModule handle = NULL;
+
+    dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
+    if (dyld_result != NSObjectFileImageSuccess)

     {
     {

-        if (info->m_className)
-            classTable.Put(info->m_className, (wxObject *)info);
-        info = info->GetNext();
+       TranslateError(path, dyld_result);

     }
     }

-
-    // Set base pointers for each wxClassInfo
-    info = first;
-    while (info)
+    else

     {
     {

-        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;
+       // 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, NSLINKMODULE_OPTION_BINDNOW);

     }
     }

+
+    return handle;

 }
 
 }
 

-void *wxLibrary::GetSymbol(const wxString& symbname)
+int dlclose(void *handle)

 {
 {

-   return wxDllLoader::GetSymbol(m_handle, symbname);
+    NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE);
+    return 0;
+}
+
+void *dlsym(void *handle, const char *symbol)
+{
+    void *addr;
+    
+    NSSymbol nsSymbol = NSLookupSymbolInModule( handle , symbol ) ;
+
+    if ( nsSymbol) 
+    {
+           addr = NSAddressOfSymbol(nsSymbol);
+    }
+    else 
+    {
+           addr = NULL;
+    }
+    return addr;

 }
 
 }
 

+#endif // defined(__DARWIN__)
+
+

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

-// wxDllLoader
+// wxDynamicLibrary

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

-/* static */
-wxString wxDllLoader::GetDllExt()
-{
-    wxString ext;
+//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__)

-    ext = _T(".dll");
+    const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    const wxChar *wxDynamicLibrary::ms_dllext = _T("");

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

-#   if defined(__HPUX__)
-        ext = _T(".sl");
-#   else //__HPUX__
-        ext = _T(".so");
-#   endif //__HPUX__
+    #if defined(__HPUX__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+    #elif defined(__DARWIN__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".dylib");
+    #else
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
+    #endif

 #endif
 
 #endif
 

-    return ext;
-}
-
-/* static */
-wxDllType
-wxDllLoader::GetProgramHandle(void)
+wxDllType wxDynamicLibrary::GetProgramHandle()

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

-   // optain 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
 }
 

-/* static */
-wxDllType
-wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
+bool wxDynamicLibrary::Load(wxString libname, int flags)

 {
 {

-    wxDllType handle;
+    wxASSERT_MSG(m_handle == 0, _T("Library already loaded."));

 
 

-#if defined(__WXMAC__)
-    FSSpec myFSSpec ;
-    Ptr myMainAddr ;
-    Str255 myErrName ;
+    // 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();
+        }
+    }

 
 

-    wxMacPathToFSSpec( libname , &myFSSpec ) ;
-    if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
-                myErrName ) != noErr )
+    // 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;
+
+    wxMacFilename2FSSpec( libname , &myFSSpec );
+
+    if( GetDiskFragment( &myFSSpec,
+                         0,
+                         kCFragGoesToEOF,
+                         "\p",
+                         kPrivateCFragCopy,
+                         &m_handle,
+                         &myMainAddr,
+                         myErrName ) != noErr )

     {
     {

-        p2cstr( myErrName ) ;
-        wxASSERT_MSG( 1 , (char*)myErrName ) ;
-        return NULL ;
+        p2cstr( myErrName );
+        wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
+                       libname.c_str(),
+                       (char*)myErrName );
+        m_handle = 0;

     }
     }

+

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

-    char zError[256] = "";
-    wxDllOpen(zError, libname, handle);
-#else // !Mac
-    handle = wxDllOpen(libname);
-#endif // OS
+    char    err[256] = "";
+    DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle);

 
 

-    if ( !handle )
+#elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
+
+#if defined(__VMS) || defined(__DARWIN__)
+    m_handle = dlopen(libname.fn_str(), 0);  // The second parameter is ignored
+#else // !__VMS  && !__DARWIN__
+    int rtldFlags = 0;
+
+    if ( flags & wxDL_LAZY )

     {
     {

-        wxString msg(_("Failed to load shared library '%s'"));
+        wxASSERT_MSG( (flags & wxDL_NOW) == 0,
+                      _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
+#ifdef RTLD_LAZY
+        rtldFlags |= RTLD_LAZY;
+#else
+        wxLogDebug(_T("wxDL_LAZY is not supported on this platform"));
+#endif
+    }
+    else if ( flags & wxDL_NOW )
+    {
+#ifdef RTLD_NOW
+        rtldFlags |= RTLD_NOW;
+#else
+        wxLogDebug(_T("wxDL_NOW is not supported on this platform"));
+#endif
+    }

 
 

-#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 ( flags & wxDL_GLOBAL )
+    {
+#ifdef RTLD_GLOBAL
+        rtldFlags |= RTLD_GLOBAL;
+#else
+        wxLogDebug(_T("RTLD_GLOBAL is not supported on this platform."));
+#endif

     }
 
     }
 

-    if ( success )
+    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 )

     {
     {

-        *success = handle != 0;
+        shlFlags |= BIND_IMMEDIATE;

     }
     }

+    m_handle = shl_load(libname.fn_str(), BIND_DEFERRED, 0);

 
 

-    return handle;
-}
+#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'"));
+#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
+    }
+
+    return IsLoaded();
+}

 
 /* static */
 
 /* static */

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

 {
 {

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

 }
 
 }
 

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

 {
 {

-    void *symbol = NULL;    // return value
+    wxCHECK_MSG( IsLoaded(), NULL,
+                 _T("Can't load symbol from unloaded library") );
+
+    bool     failed = FALSE;
+    void    *symbol = 0;
+
+    wxUnusedVar(symbol);
+#if defined(__WXMAC__) && !defined(__DARWIN__)
+    Ptr                 symAddress;
+    CFragSymbolClass    symClass;
+    Str255              symName;
+#if TARGET_CARBON
+    c2pstrcpy( (StringPtr) symName, name.fn_str() );
+#else
+    strcpy( (char *)symName, name.fn_str() );
+    c2pstr( (char *)symName );
+#endif
+    if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
+        symbol = (void *)symAddress;
+
+#elif defined(__WXPM__) || defined(__EMX__)
+    DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
+
+#elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
+    symbol = dlsym( m_handle, name.fn_str() );

 
 

-#if defined( __WXMAC__ )
-    Ptr symAddress ;
-    CFragSymbolClass symClass ;
-    Str255 symName ;
+#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;

 
 

-    strcpy( (char*) symName , name ) ;
-    c2pstr( (char*) symName ) ;
+#elif defined(__WINDOWS__)
+#ifdef __WXWINCE__
+    symbol = (void*) ::GetProcAddress( m_handle, name );
+#else
+    symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() );
+#endif

 
 

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

 #else
 #else

-    // mb_str() is necessary in Unicode build
-    symbol = wxDllGetSymbol(dllHandle, name.mb_str());
+#error  "runtime shared lib support not implemented"

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

+#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(wxT("%s"), err);
+        }
+#else
+        failed = TRUE;

         wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
                       name.c_str());
         wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
                       name.c_str());

+#endif

     }
     }

+    if( success )
+        *success = !failed;
+

     return symbol;
 }
     return symbol;
 }

-
-// ---------------------------------------------------------------------------
-// wxLibraries (only one instance should normally exist)
-// ---------------------------------------------------------------------------
-
-wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
+    
+
+/*static*/
+wxString
+wxDynamicLibrary::CanonicalizeName(const wxString& name,
+                                   wxDynamicLibraryCategory
+#ifdef __UNIX__
+                                        cat
+#else // !__UNIX__
+                                        WXUNUSED(cat)
+#endif // __UNIX__/!__UNIX__
+                                   )

 {
 {

-}
+    wxString nameCanonic;

 
 

-wxLibraries::~wxLibraries()
-{
-    wxNode *node = m_loaded.First();
+    // under Unix the library names usually start with "lib" prefix, add it
+#ifdef __UNIX__
+    switch ( cat )
+    {
+        default:
+            wxFAIL_MSG( _T("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 = _T("lib");
+            break;

     }
     }

+#endif // __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 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 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 suffix;
+    if ( cat == wxDL_PLUGIN_GUI )

     {
     {

-        wxString fullname(tokenizer.NextToken());
+        wxAppTraits *traits = wxAppConsole::GetInstance() ?
+                              wxAppConsole::GetInstance()->GetTraits() : NULL;
+        wxASSERT_MSG( traits, 
+               _("can't query for GUI plugins name in console applications") );
+        suffix = traits->GetToolkitInfo().shortName;
+    }
+#if wxUSE_UNICODE
+    suffix << _T('u');
+#endif
+#ifdef __WXDEBUG__
+    suffix << _T('d');
+#endif

 
 

-        fullname << wxT('/') << libname;
-        if ( wxFileExists(fullname) )
-        {
-            libname = fullname;
+    if ( !suffix.empty() )
+        suffix = wxString(_T("_")) + suffix;

 
 

-            // found the library
-            break;
-        }
-    }
-    //else: not found in the path, leave the name as is (secutiry risk?)
+#define WXSTRINGIZE(x)  #x
+#ifdef __UNIX__
+    #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 << _T("_gcc");
+    #elif defined(__VISUALC__)
+        suffix << _T("_vc");
+    #elif defined(__WATCOMC__)
+        suffix << _T("_wat");
+    #elif defined(__BORLANDC__)
+        suffix << _T("_bcc");
+    #endif

 #endif
 
 #endif
 

-    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);
-    }
-    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
 #endif // wxUSE_DYNLIB_CLASS