fixed bug with not NUL-terminating the string in GAddress_UNIX_SetPath

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 8ad47c2b837bbc0cb1ede3418e61edf7361e0d1a..91981e3061c0e741e145e75f1b6a10a31f9d0c4d 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -26,53 +26,90 @@
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif

-#if wxUSE_DYNLIB_CLASS
+
+#if wxUSE_DYNLIB_CLASS && !wxUSE_DYNAMIC_LOADER
+
+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h"
+#endif

 
 #include "wx/dynlib.h"
 #include "wx/filefn.h"
 #include "wx/intl.h"
 #include "wx/log.h"
 
 #include "wx/dynlib.h"
 #include "wx/filefn.h"
 #include "wx/intl.h"
 #include "wx/log.h"

-#include "wx/tokenzr.h"
+
+#if defined(__WXMAC__)
+    #include "wx/mac/private.h"
+#endif

 
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 
 // ----------------------------------------------------------------------------
 // conditional compilation
 // ----------------------------------------------------------------------------
 

-#if defined(HAVE_DLOPEN)
-#   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
-#   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
+#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                    dlclose
 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)

-#   define wxDllClose      shl_unload
+#   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__)
-#   include <windows.h>
+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 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
 #   ifdef __WIN32__
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__

-#      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
+#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
 #   else   // Win16
 #      define wxDllOpen(lib)                  ::LoadLibrary(lib)
 #   endif  // Win32/16
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary

-
-#elif defined(__OS2__)
-
-#  define INCL_DOS
-#  include <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(__WXMAC__)
+#   define wxDllClose(handle)               CloseConnection(&((CFragConnectionID)handle))

 #else
 #   error "Don't know how to load shared libraries on this platform."
 #endif // OS
 #else
 #   error "Don't know how to load shared libraries on this platform."
 #endif // OS


@@ -83,34 +120,20 @@
 
 wxLibraries wxTheLibraries;
 
 
 wxLibraries wxTheLibraries;
 

-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
+// ============================================================================
+// 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)
 {
 
 // 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__) || defined(__OS2__)
-    fullname << ".dll";
-#endif
+    wxString fullname;
+    fullname << basename << wxDllLoader::GetDllExt();

 
     return fullname;
 }
 
 
     return fullname;
 }
 

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

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


@@ -155,7 +178,7 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
     {
         if (info->m_className)
             classTable.Put(info->m_className, (wxObject *)info);
     {
         if (info->m_className)
             classTable.Put(info->m_className, (wxObject *)info);

-        info = info->GetNext();
+        info = info->m_next;

     }
 
     // Set base pointers for each wxClassInfo
     }
 
     // Set base pointers for each wxClassInfo


@@ -179,96 +202,153 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 // wxDllLoader
 // ---------------------------------------------------------------------------
 
 // wxDllLoader
 // ---------------------------------------------------------------------------
 

+
+#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
+const wxString wxDllLoader::ms_dllext( _T(".dll") );
+#elif defined(__UNIX__)
+#if defined(__HPUX__)
+const wxString wxDllLoader::ms_dllext( _T(".sl") );
+#else
+const wxString wxDllLoader::ms_dllext( _T(".so") );
+#endif
+#elif defined(__WXMAC__)
+const wxString wxDllLoader::ms_dllext( _T("") );
+#endif
+

 /* static */
 /* static */

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

 {
 {

-#if defined( HAVE_DLOPEN )
+#if defined( HAVE_DLOPEN ) && !defined(__EMX__)

    // optain handle for main program
    // optain handle for main program

-   return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/); 
+   return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);

 #elif defined (HAVE_SHL_LOAD)
    // shl_findsymbol with NULL handle looks up in main program
 #elif defined (HAVE_SHL_LOAD)
    // shl_findsymbol with NULL handle looks up in main program

-   return 0; 
+   return 0;

 #else
 #else

-   wxFAIL_MSG(_("This method is not implemented under Windows or OS/2"));
+   wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));

    return 0;
 #endif
 }
 
 /* static */
    return 0;
 #endif
 }
 
 /* static */

-wxDllType
-wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
+wxDllType wxDllLoader::LoadLibrary(const wxString & libname, bool *success)

 {
 {

-    wxDllType handle;
-
-#if defined(__WXMAC__)
-    FSSpec myFSSpec ;
-    Ptr        myMainAddr ;
-    Str255     myErrName ;
-
-    wxMacPathToFSSpec( libname , &myFSSpec ) ;
-    if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
-                myErrName ) != noErr )
+    wxDllType   handle;
+    bool        failed = FALSE;
+
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    FSSpec      myFSSpec;
+    Ptr         myMainAddr;
+    Str255      myErrName;
+
+    wxMacFilename2FSSpec( libname , &myFSSpec );
+
+    if( GetDiskFragment( &myFSSpec,
+                         0,
+                         kCFragGoesToEOF,
+                         "\p",
+                         kPrivateCFragCopy,
+                         &((CFragConnectionID)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 );
+        handle = 0;
+        failed = TRUE;

     }
     }

-#elif defined(__OS2__)
-    char                            zError[256] = "";
+
+#elif defined(__WXPM__) || defined(__EMX__)
+    char        zError[256] = "";

     wxDllOpen(zError, libname, handle);
     wxDllOpen(zError, libname, handle);

-#else // !Mac
+
+#else

     handle = wxDllOpen(libname);
     handle = wxDllOpen(libname);

-#endif // OS
+
+#endif

 
     if ( !handle )
     {
 
     if ( !handle )
     {

-        wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str());
+        wxString msg(_("Failed to load shared library '%s'"));
+
+#ifdef HAVE_DLERROR
+        const wxChar *err = dlerror();
+        if( err )
+        {
+            failed = TRUE;
+            wxLogError( msg, err );
+        }
+#else
+        failed = TRUE;
+        wxLogSysError( msg, libname.c_str() );
+#endif

     }
 
     if ( success )
     }
 
     if ( success )

-    {
-        *success = handle != 0;
-    }
+        *success = !failed;

 
     return handle;
 }
 
 
 /* static */
 
     return handle;
 }
 
 
 /* static */

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

 {
    wxDllClose(handle);
 }
 
 /* static */
 {
    wxDllClose(handle);
 }
 
 /* static */

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

 {
 {

-    void *symbol = NULL;    // return value
+    bool    failed = FALSE;
+    void    *symbol = 0;

 
 

-#if defined( __WXMAC__ )
-    Ptr symAddress ;
-    CFragSymbolClass symClass ;
-    Str255     symName ;
+#if defined(__WXMAC__) && !defined(__UNIX__)
+    Ptr                 symAddress;
+    CFragSymbolClass    symClass;
+    Str255              symName;

 
 

-    strcpy( (char*) symName , name ) ;
-    c2pstr( (char*) symName ) ;
+#if TARGET_CARBON
+    c2pstrcpy( (StringPtr) symName, name );
+#else
+    strcpy( (char *) symName, name );
+    c2pstr( (char *) symName );
+#endif
+    if( FindSymbol( ((CFragConnectionID)dllHandle), symName, &symAddress, &symClass ) == noErr )
+        symbol = (void *)symAddress;

 
 

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

     wxDllGetSymbol(dllHandle, symbol);
     wxDllGetSymbol(dllHandle, symbol);

+

 #else
 #else

-    symbol = wxDllGetSymbol(dllHandle, name);
+    // mb_str() is necessary in Unicode build
+    symbol = wxDllGetSymbol(dllHandle, name.mb_str());
+

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

+        wxString msg(_("wxDllLoader failed to GetSymbol '%s'"));
+
+#ifdef HAVE_DLERROR
+        const wxChar *err = dlerror();
+        if( err )
+        {
+            failed = TRUE;
+            wxLogError( msg, 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;
 }
 


@@ -294,59 +374,26 @@ wxLibraries::~wxLibraries()
 
 wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 {
 
 wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 {

-    wxNode *node;
-    wxLibrary *lib;
+    wxLibrary   *lib;

     wxClassInfo *old_sm_first;
     wxClassInfo *old_sm_first;

+    wxNode      *node = m_loaded.Find(name.GetData());

 
 

-#if defined(__VISAGECPP__)
-    node = m_loaded.Find(name.GetData());

     if (node != NULL)
         return ((wxLibrary *)node->Data());
     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);
 
     // 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 << ':' << envLibPath;
-    wxStringTokenizer tokenizer(libPath, wxT(':'));
-    while ( tokenizer.HasMoreToken() )
-    {
-        wxString fullname(tokenizer.NextToken());
-
-        fullname << '/' << 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
-

     bool success = FALSE;
     wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);
     if(success)
     {
        lib = new wxLibrary(handle);
        wxClassInfo::sm_first = old_sm_first;
     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
        m_loaded.Append(name.GetData(), lib);
     }
     else


@@ -369,4 +416,85 @@ wxObject *wxLibraries::CreateObject(const wxString& path)
     return NULL;
 }
 
     return NULL;
 }
 

-#endif // wxUSE_DYNLIB_CLASS
+#endif // wxUSE_DYNLIB_CLASS && !wxUSE_DYNAMIC_LOADER
+
+#if defined(__DARWIN__) && (wxUSE_DYNLIB_CLASS || wxUSE_DYNAMIC_LOADER)
+// ---------------------------------------------------------------------------
+// For Darwin/Mac OS X
+//   supply the sun style dlopen functions in terms of Darwin NS*
+// ---------------------------------------------------------------------------
+
+#include <stdio.h>
+#include <mach-o/dyld.h>
+
+static char dl_last_error[1024];
+
+static
+void TranslateError(const char *path, 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]))
+
+    index = number;
+    if (index > NUM_OFI_ERRORS - 1) {
+        index = NUM_OFI_ERRORS - 1;
+    }
+    sprintf(dl_last_error, OFIErrorStrings[index], path, number);
+}
+
+const char *dlerror()
+{
+    return dl_last_error;
+}
+
+void *dlopen(const char *path, int mode /* mode is ignored */)
+{
+    int dyld_result;
+    NSObjectFileImage ofile;
+    NSModule handle = NULL;
+
+    dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
+    if (dyld_result != NSObjectFileImageSuccess)
+    {
+       TranslateError(path, dyld_result);
+    }
+    else
+    {
+       // 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;
+}
+
+int dlclose(void *handle)
+{
+    NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE);
+    return 0;
+}
+
+void *dlsym(void *handle, const char *symbol)
+{
+    void *addr;
+
+    if (NSIsSymbolNameDefined(symbol)) {
+       addr = NSAddressOfSymbol(NSLookupAndBindSymbol(symbol));
+    }
+    else {
+       addr = NULL;
+    }
+    return addr;
+}
+
+#endif // defined(__DARWIN__) && (wxUSE_DYNLIB_CLASS || wxUSE_DYNAMIC_LOADER)