removing path corrections for wxMac, we now want a correct platform string for unzOpen

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 3660cc21f81211392d5d2fddb3cf28be82a286d1..558b579e0c53694b17f31fb36fed426d339c9b18 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -27,7 +27,7 @@
   #pragma hdrstop
 #endif
 
   #pragma hdrstop
 #endif
 

-#if wxUSE_DYNLIB_CLASS
+#if wxUSE_DYNLIB_CLASS && !wxUSE_DYNAMIC_LOADER

 
 #if defined(__WINDOWS__)
     #include "wx/msw/private.h"
 
 #if defined(__WINDOWS__)
     #include "wx/msw/private.h"


@@ -37,7 +37,10 @@
 #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"
+
+#if defined(__WXMAC__)
+    #include "wx/mac/private.h"
+#endif

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


@@ -68,14 +71,15 @@
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
 #   define wxDllClose                    shl_unload
 
 #   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;
-    }
+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.
 #elif defined(__DARWIN__)
 /* Porting notes:
  *   The dlopen port is a port from dl_next.xs by Anno Siegel.


@@ -105,7 +109,7 @@ const char *dlerror(void);
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary
 #elif defined(__WXMAC__)
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary
 #elif defined(__WXMAC__)

-#   define wxDllClose(handle)               CloseConnection(&handle)
+#   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


@@ -142,7 +146,7 @@ wxLibrary::wxLibrary(wxDllType handle)
     m_handle = handle;
 
     // Some system may use a local heap for library.
     m_handle = handle;
 
     // Some system may use a local heap for library.

-    get_first = (t_get_first)GetSymbol("wxGetClassFirst");
+    get_first = (t_get_first)GetSymbol(_T("wxGetClassFirst"));

     // It is a wxWindows DLL.
     if (get_first)
         PrepareClasses(get_first());
     // It is a wxWindows DLL.
     if (get_first)
         PrepareClasses(get_first());


@@ -174,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 = (wxClassInfo *)info->GetNext();
+        info = info->m_next;

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


@@ -198,27 +202,21 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 // wxDllLoader
 // ---------------------------------------------------------------------------
 
 // wxDllLoader
 // ---------------------------------------------------------------------------
 

-/* static */
-wxString wxDllLoader::GetDllExt()
-{
-    wxString ext;

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

-    ext = _T(".dll");
+const wxString wxDllLoader::ms_dllext( _T(".dll") );

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

-#   if defined(__HPUX__)
-        ext = _T(".sl");
-#   else //__HPUX__
-        ext = _T(".so");
-#   endif //__HPUX__
+#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
 #endif

-
-    return ext;
-}

 
 /* static */
 
 /* static */

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

 {
 #if defined( HAVE_DLOPEN ) && !defined(__EMX__)
    // optain handle for main program
 {
 #if defined( HAVE_DLOPEN ) && !defined(__EMX__)
    // optain handle for main program


@@ -233,110 +231,124 @@ wxDllLoader::GetProgramHandle(void)
 }
 
 /* static */
 }
 
 /* static */

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

 {
 {

-    wxDllType handle;
+    wxDllType   handle;
+    bool        failed = FALSE;

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

     {
     {

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

     }
     }

+

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

-    char zError[256] = "";
+    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 )
     {
         wxString msg(_("Failed to load shared library '%s'"));
 
 #ifdef HAVE_DLERROR
 
     if ( !handle )
     {
         wxString msg(_("Failed to load shared library '%s'"));
 
 #ifdef HAVE_DLERROR

-        const char *errmsg = dlerror();
-        if ( errmsg )
+        const wxChar *err = dlerror();
+        if( err )

         {
         {

-            // 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());
+            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__) && !defined(__UNIX__)
 
 #if defined(__WXMAC__) && !defined(__UNIX__)

-    Ptr symAddress ;
-    CFragSymbolClass symClass ;
-    Str255 symName ;
+    Ptr                 symAddress;
+    CFragSymbolClass    symClass;
+    Str255              symName;

 
 #if TARGET_CARBON
 
 #if TARGET_CARBON

-    c2pstrcpy( (StringPtr) symName , name ) ;
+    c2pstrcpy( (StringPtr) symName, name );

 #else
 #else

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

 #endif
 #endif

+    if( FindSymbol( ((CFragConnectionID)dllHandle), symName, &symAddress, &symClass ) == noErr )
+        symbol = (void *)symAddress;

 
 

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

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

-#else
+
+#else // Windows or Unix
+

     // mb_str() is necessary in Unicode build
     // mb_str() is necessary in Unicode build

-    symbol = wxDllGetSymbol(dllHandle, name.mb_str());
-#endif
+    //
+    // "void *" cast is needed by gcc 3.1 + w32api 1.4, don't ask me why
+    symbol = (void *)wxDllGetSymbol(dllHandle, name.mb_str());
+
+#endif // OS

 
     if ( !symbol )
     {
 
     if ( !symbol )
     {

+#ifdef HAVE_DLERROR
+        const wxChar *err = dlerror();
+        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;
 }
 


@@ -362,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())) != 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);
 
     // 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
-

     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


@@ -437,25 +416,21 @@ wxObject *wxLibraries::CreateObject(const wxString& path)
     return NULL;
 }
 
     return NULL;
 }
 

-#ifdef __DARWIN__
+#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*
 // ---------------------------------------------------------------------------
 
 // ---------------------------------------------------------------------------
 // For Darwin/Mac OS X
 //   supply the sun style dlopen functions in terms of Darwin NS*
 // ---------------------------------------------------------------------------
 

-extern "C" {
-#import <mach-o/dyld.h>
-};
-
-enum dyldErrorSource
-{
-    OFImage,
-};
+#include <stdio.h>
+#include <mach-o/dyld.h>

 
 static char dl_last_error[1024];
 
 static
 
 static char dl_last_error[1024];
 
 static

-void TranslateError(const char *path, enum dyldErrorSource type, int number)
+void TranslateError(const char *path, int number)

 {
     unsigned int index;
     static char *OFIErrorStrings[] =
 {
     unsigned int index;
     static char *OFIErrorStrings[] =


@@ -470,21 +445,11 @@ void TranslateError(const char *path, enum dyldErrorSource type, int number)
     };
 #define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
 
     };
 #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;
+    index = number;
+    if (index > NUM_OFI_ERRORS - 1) {
+        index = NUM_OFI_ERRORS - 1;

     }
     }

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

 }
 
 const char *dlerror()
 }
 
 const char *dlerror()


@@ -492,7 +457,7 @@ const char *dlerror()
     return dl_last_error;
 }
 
     return dl_last_error;
 }
 

-void *dlopen(const char *path, int mode /* mode is ignored */)
+void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)

 {
     int dyld_result;
     NSObjectFileImage ofile;
 {
     int dyld_result;
     NSObjectFileImage ofile;


@@ -501,24 +466,25 @@ void *dlopen(const char *path, int mode /* mode is ignored */)
     dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
     if (dyld_result != NSObjectFileImageSuccess)
     {
     dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
     if (dyld_result != NSObjectFileImageSuccess)
     {

-       TranslateError(path, OFImage, dyld_result);
+       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.
     }
     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, TRUE);
+       handle = NSLinkModule(ofile, path, NSLINKMODULE_OPTION_BINDNOW);

     }
 
     return handle;
 }
 
     }
 
     return handle;
 }
 

-int dlclose(void *handle) /* stub only */
+int dlclose(void *handle)

 {
 {

+    NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE);

     return 0;
 }
 
     return 0;
 }
 

-void *dlsym(void *handle, const char *symbol)
+void *dlsym(void *WXUNUSED(handle), const char *symbol)

 {
     void *addr;
 
 {
     void *addr;
 


@@ -531,6 +497,4 @@ void *dlsym(void *handle, const char *symbol)
     return addr;
 }
 
     return addr;
 }
 

-#endif // __DARWIN__
-
-#endif // wxUSE_DYNLIB_CLASS
+#endif // defined(__DARWIN__) && (wxUSE_DYNLIB_CLASS || wxUSE_DYNAMIC_LOADER)