From f9ee64b1356530b7f5c957d250d2a1dcbef60f60 Mon Sep 17 00:00:00 2001 From: Gilles Depeyrot Date: Mon, 18 Feb 2002 22:17:00 +0000 Subject: [PATCH] corrections to dynamic loading for Darwin git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@14298 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775 --- src/common/dynlib.cpp | 34 ++++---------- src/common/dynload.cpp | 103 +++++++++-------------------------------- 2 files changed, 31 insertions(+), 106 deletions(-) diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index 6dd93ebcdc..716ba55d7f 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -422,19 +422,12 @@ wxObject *wxLibraries::CreateObject(const wxString& path) // 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) +void TranslateError(const char *path, int number) { unsigned int index; static char *OFIErrorStrings[] = @@ -449,21 +442,11 @@ void TranslateError(const char *path, enum dyldErrorSource type, int number) }; #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() @@ -480,20 +463,21 @@ void *dlopen(const char *path, int mode /* mode is ignored */) 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. - handle = NSLinkModule(ofile, path, TRUE); + handle = NSLinkModule(ofile, path, NSLINKMODULE_OPTION_BINDNOW); } return handle; } -int dlclose(void *handle) /* stub only */ +int dlclose(void *handle) { + NSUnLinkModule( m_handle, NSUNLINKMODULE_OPTION_NONE); return 0; } diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index c88597a1b9..b127ecf5d2 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -39,6 +39,19 @@ #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 // ============================================================================ @@ -88,7 +101,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) } } -#if defined(__WXMAC__) && !defined(__UNIX__) +#if defined(__WXMAC__) && !defined(__DARWIN__) FSSpec myFSSpec; Ptr myMainAddr; Str255 myErrName; @@ -115,9 +128,9 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) char err[256] = ""; 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; @@ -141,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; @@ -158,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()); @@ -201,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 @@ -224,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; @@ -240,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() ); @@ -556,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) // --------------------------------------------------------------------------- -- 2.47.2