X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/ffcb4ee424061633cedc1c0ba6c04180d5048da9..8dfef0c246fb5c741334ecc085aea56324bc0bf8:/src/common/dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index ab4178d9a0..c2adec7818 100644
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -30,7 +30,7 @@
 #if wxUSE_DYNLIB_CLASS
 
 #if defined(__WINDOWS__)
-    #include "wx/msw/private.h"
+    #include "wx/msw/wrapwin.h"
 #endif
 
 #include "wx/dynlib.h"
@@ -75,13 +75,13 @@ 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",
+        "%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]))
 
@@ -99,22 +99,28 @@ const char *dlerror()
 
 void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
 {
-    int dyld_result;
     NSObjectFileImage ofile;
     NSModule handle = NULL;
 
-    dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
-    if (dyld_result != NSObjectFileImageSuccess)
+    int dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
+    if ( dyld_result != NSObjectFileImageSuccess )
     {
-	TranslateError(path, dyld_result);
+        handle = NULL;
     }
     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);
+        handle = NSLinkModule
+                 (
+                    ofile,
+                    path,
+                    NSLINKMODULE_OPTION_BINDNOW |
+                    NSLINKMODULE_OPTION_RETURN_ON_ERROR
+                 );
     }
 
+    if ( !handle )
+        TranslateError(path, dyld_result);
+
     return handle;
 }
 
@@ -126,19 +132,16 @@ int dlclose(void *handle)
 
 void *dlsym(void *handle, const char *symbol)
 {
-    void *addr;
-    
-    NSSymbol nsSymbol = NSLookupSymbolInModule( handle , symbol ) ;
-
-    if ( nsSymbol) 
-    {
-	    addr = NSAddressOfSymbol(nsSymbol);
-    }
-    else 
-    {
-	    addr = NULL;
-    }
-    return addr;
+    // as on many other systems, C symbols have prepended underscores under
+    // Darwin but unlike the normal dlopen(), NSLookupSymbolInModule() is not
+    // aware of this
+    wxCharBuffer buf(strlen(symbol) + 1);
+    char *p = buf.data();
+    p[0] = '_';
+    strcpy(p + 1, symbol);
+
+    NSSymbol nsSymbol = NSLookupSymbolInModule( handle, p );
+    return nsSymbol ? NSAddressOfSymbol(nsSymbol) : NULL;
 }
 
 #endif // defined(__DARWIN__)
@@ -153,9 +156,13 @@ void *dlsym(void *handle, const char *symbol)
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    const wxChar *wxDynamicLibrary::ms_dllext = _T("");
 #elif defined(__UNIX__)
     #if defined(__HPUX__)
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
+    #elif defined(__DARWIN__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".bundle");
     #else
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
     #endif
@@ -208,10 +215,9 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
                          &myMainAddr,
                          myErrName ) != noErr )
     {
-        p2cstr( myErrName );
         wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
                        libname.c_str(),
-                       (char*)myErrName );
+                       wxMacMakeStringFromPascal( myErrName ).c_str() );
         m_handle = 0;
     }
 
@@ -318,14 +324,14 @@ void wxDynamicLibrary::Unload(wxDllType handle)
 #endif
 }
 
-void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
+void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const
 {
     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;
@@ -363,6 +369,15 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 #error  "runtime shared lib support not implemented"
 #endif
 
+    if ( success )
+        *success = symbol != NULL;
+
+    return symbol;
+}
+
+void *wxDynamicLibrary::GetSymbol(const wxString& name, bool *success) const
+{
+    void *symbol = DoGetSymbol(name, success);
     if ( !symbol )
     {
 #if defined(HAVE_DLERROR) && !defined(__EMX__)
@@ -379,17 +394,13 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
             wxLogError(wxT("%s"), err);
         }
 #else
-        failed = TRUE;
         wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
                       name.c_str());
 #endif
     }
-    if( success )
-        *success = !failed;
 
     return symbol;
 }
-    
 
 /*static*/
 wxString
@@ -404,7 +415,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name,
 {
     wxString nameCanonic;
 
-    // under Unix the library names usualyl start with "lib" prefix, add it
+    // under Unix the library names usually start with "lib" prefix, add it
 #ifdef __UNIX__
     switch ( cat )
     {
@@ -436,7 +447,7 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
     {
         wxAppTraits *traits = wxAppConsole::GetInstance() ?
                               wxAppConsole::GetInstance()->GetTraits() : NULL;
-        wxASSERT_MSG( traits, 
+        wxASSERT_MSG( traits,
                _("can't query for GUI plugins name in console applications") );
         suffix = traits->GetToolkitInfo().shortName;
     }
@@ -485,20 +496,27 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
 
     return CanonicalizeName(name + suffix, wxDL_MODULE);
 }
-    
+
 /*static*/
 wxString wxDynamicLibrary::GetPluginsDirectory()
 {
 #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");
-    wxString dir;
     dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
-    return dir;
 #else
+           << wxT("%i.%i.%i");
+    dir.Printf(format.c_str(),
+               wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
+#endif
+    return dir;
+
+#else // ! __UNIX__
     return wxEmptyString;
 #endif
 }