X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/7fc0bd1c0541a819d51354a4a86f126dbb8ad08f..0fe5e8fea017ecb73f8aaa8ceb745feb269b3f79:/src/common/dynload.cpp diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index 490ca392d7..b127ecf5d2 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -21,22 +21,36 @@ #include "wx/wxprec.h" #ifdef __BORLANDC__ -#pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DYNAMIC_LOADER #ifdef __WINDOWS__ -#include "wx/msw/private.h" + #include "wx/msw/private.h" #endif #ifndef WX_PRECOMP -#include "wx/log.h" -#include "wx/intl.h" + #include "wx/log.h" + #include "wx/intl.h" #endif +#include "wx/filename.h" // for SplitPath() + #include "wx/dynload.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 // ============================================================================ // implementation @@ -75,10 +89,19 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) { wxASSERT_MSG(m_handle == 0, _T("Library already loaded.")); - if( !(flags & wxDL_VERBATIM) ) - libname += GetDllExt(); + // 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__) +#if defined(__WXMAC__) && !defined(__DARWIN__) FSSpec myFSSpec; Ptr myMainAddr; Str255 myErrName; @@ -103,11 +126,11 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) #elif defined(__WXPM__) || defined(__EMX__) char err[256] = ""; - DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle) + DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle); -#elif defined(HAVE_DLOPEN) +#elif defined(HAVE_DLOPEN) || defined(__DARWIN__) -#ifdef __VMS +#if defined(__VMS) || defined(__DARWIN__) m_handle = dlopen(libname.c_str(), 0); // The second parameter is ignored #else int rtldFlags = 0; @@ -131,7 +154,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) } m_handle = dlopen(libname.c_str(), rtldFlags); -#endif // __VMS +#endif // __VMS || __DARWIN__ #elif defined(HAVE_SHL_LOAD) int shlFlags = 0; @@ -148,21 +171,6 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) } m_handle = shl_load(libname.c_str(), BIND_DEFERRED, 0); -#elif defined(__DARWIN__) - NSObjectFileImage ofile; - int dyld_result = NSCreateObjectFileImageFromFile(libname.c_str(), &ofile); - - if (dyld_result != NSObjectFileImageSuccess) - { - TranslateError(libname.c_str(), OFImage, 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. - m_handle = NSLinkModule(ofile, libname.c_str(), TRUE); - } - #elif defined(__WINDOWS__) m_handle = ::LoadLibrary(libname.c_str()); @@ -173,7 +181,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) if ( m_handle == 0 ) { wxString msg(_("Failed to load shared library '%s'")); -#ifdef HAVE_DLERROR +#if defined(HAVE_DLERROR) && !defined(__EMX__) const wxChar *err = dlerror(); if( err ) wxLogError( msg, err ); @@ -191,14 +199,14 @@ void wxDynamicLibrary::Unload() { #if defined(__WXPM__) || defined(__EMX__) DosFreeModule( m_handle ); -#elif defined(HAVE_DLOPEN) +#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__) - CloseConnection( &m_handle ); +#elif defined(__WXMAC__) && !defined(__DARWIN__) + CloseConnection( (CFragConnectionID*) &m_handle ); #else #error "runtime shared lib support not implemented" #endif @@ -214,7 +222,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const bool failed = FALSE; void *symbol = 0; -#if defined(__WXMAC__) && !defined(__UNIX__) +#if defined(__WXMAC__) && !defined(__DARWIN__) Ptr symAddress; CFragSymbolClass symClass; Str255 symName; @@ -230,17 +238,13 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const #elif defined(__WXPM__) || defined(__EMX__) DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol ); -#elif defined(HAVE_DLOPEN) +#elif defined(HAVE_DLOPEN) || defined(__DARWIN__) symbol = dlsym( m_handle, name.c_str() ); #elif defined(HAVE_SHL_LOAD) if( shl_findsym( &m_handle, name.c_str(), TYPE_UNDEFINED, &symbol ) != 0 ) symbol = 0; -#elif defined(__DARWIN__) - if( NSIsSymbolNameDefined( name.c_str() ) ) - symbol = NSAddressOfSymbol( NSLookupAndBindSymbol( name.c_str() ) ); - #elif defined(__WINDOWS__) symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() ); @@ -251,7 +255,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const if ( !symbol ) { wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'")); -#ifdef HAVE_DLERROR +#if defined(HAVE_DLERROR) && !defined(__EMX__) const wxChar *err = dlerror(); if( err ) { @@ -546,59 +550,6 @@ void wxPluginManager::Unload() } } - -#ifdef __DARWIN__ -// --------------------------------------------------------------------------- -// For Darwin/Mac OS X -// supply the sun style dlopen functions in terms of Darwin NS* -// --------------------------------------------------------------------------- - -extern "C" { -#import -}; - -enum dyldErrorSource -{ - OFImage, -}; - -static char dl_last_error[1024]; - -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; - } -} - -#endif // __DARWIN__ - - // --------------------------------------------------------------------------- // wxDllLoader (all these methods are static) // ---------------------------------------------------------------------------