X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/63fd5f0b273fd2e8d663a671731dec3ee7564f72..70e881039bfeab2f3cdd42ea8093f7313c5623a6:/src/common/dynload.cpp diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index f330d81665..6e42ede2c6 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -7,7 +7,7 @@ // Created: 03/12/01 // RCS-ID: $Id$ // Copyright: (c) 2001 Ron Lee -// Licence: wxWindows license +// Licence: wxWindows licence ///////////////////////////////////////////////////////////////////////////// #ifdef __GNUG__ @@ -33,9 +33,11 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/intl.h" + #include "wx/hash.h" #endif #include "wx/filename.h" // for SplitPath() +#include "wx/strconv.h" #include "wx/dynload.h" #include "wx/module.h" @@ -167,7 +169,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) #endif } - m_handle = dlopen(libname.c_str(), rtldFlags); + m_handle = dlopen(libname.fn_str(), rtldFlags); #endif // __VMS || __DARWIN__ ? #elif defined(HAVE_SHL_LOAD) @@ -183,7 +185,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) { shlFlags |= BIND_IMMEDIATE; } - m_handle = shl_load(libname.c_str(), BIND_DEFERRED, 0); + m_handle = shl_load(libname.fn_str(), BIND_DEFERRED, 0); #elif defined(__WINDOWS__) m_handle = ::LoadLibrary(libname.c_str()); @@ -195,7 +197,14 @@ bool wxDynamicLibrary::Load(wxString libname, int flags) { wxString msg(_("Failed to load shared library '%s'")); #if defined(HAVE_DLERROR) && !defined(__EMX__) - const wxChar *err = dlerror(); + +#if wxUSE_UNICODE + wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() ); + const wxChar *err = buffer; +#else + const wxChar *err = dlerror(); +#endif + if( err ) wxLogError( msg, err ); #else @@ -252,10 +261,13 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol ); #elif defined(HAVE_DLOPEN) || defined(__DARWIN__) - symbol = dlsym( m_handle, name.c_str() ); + symbol = dlsym( m_handle, name.fn_str() ); #elif defined(HAVE_SHL_LOAD) - if( shl_findsym( &m_handle, name.c_str(), TYPE_UNDEFINED, &symbol ) != 0 ) + // use local variable since shl_findsym modifies the handle argument + // to indicate where the symbol was found (GD) + wxDllType the_handle = m_handle; + if( shl_findsym( &the_handle, name.fn_str(), TYPE_UNDEFINED, &symbol ) != 0 ) symbol = 0; #elif defined(__WINDOWS__) @@ -267,13 +279,18 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const if ( !symbol ) { - wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'")); #if defined(HAVE_DLERROR) && !defined(__EMX__) + +#if wxUSE_UNICODE + wxWCharBuffer buffer = wxConvLocal.cMB2WC( dlerror() ); + const wxChar *err = buffer; +#else const wxChar *err = dlerror(); +#endif + if( err ) { - failed = TRUE; - wxLogError( msg, err ); + wxLogError(wxT("%s"), err); } #else failed = TRUE; @@ -401,12 +418,11 @@ void wxPluginLibrary::UpdateClassInfo() // Hash all the class names into a local table too so // we can quickly find the entry they correspond to. - - if( ms_classes->Get(info->m_className) == 0 ) - ms_classes->Put(info->m_className, (wxObject *) this); + (*ms_classes)[info->m_className] = this; } } +#if wxUSE_EXTENDED_RTTI == 0 for(info = m_after; info != m_before; info = info->m_next) { if( info->m_baseClassName1 ) @@ -414,6 +430,7 @@ void wxPluginLibrary::UpdateClassInfo() if( info->m_baseClassName2 ) info->m_baseInfo2 = (wxClassInfo *)t->Get(info->m_baseClassName2); } +#endif } void wxPluginLibrary::RestoreClassInfo() @@ -423,7 +440,7 @@ void wxPluginLibrary::RestoreClassInfo() for(info = m_after; info != m_before; info = info->m_next) { wxClassInfo::sm_classTable->Delete(info->m_className); - ms_classes->Delete(info->m_className); + ms_classes->erase(ms_classes->find(info->m_className)); } if( wxClassInfo::sm_first == m_after ) @@ -452,7 +469,7 @@ void wxPluginLibrary::RegisterModules() wxASSERT_MSG( m_linkcount == 1, _T("RegisterModules should only be called for the first load") ); - for(wxClassInfo *info = m_after; info != m_before; info = info->m_next) + for ( wxClassInfo *info = m_after; info != m_before; info = info->m_next) { if( info->IsKindOf(CLASSINFO(wxModule)) ) { @@ -460,16 +477,18 @@ void wxPluginLibrary::RegisterModules() wxASSERT_MSG( m, _T("wxDynamicCast of wxModule failed") ); - m_wxmodules.Append(m); + m_wxmodules.push_back(m); wxModule::RegisterModule(m); } } // FIXME: Likewise this is (well was) very similar to InitializeModules() - for(wxModuleList::Node *node = m_wxmodules.GetFirst(); node; node->GetNext()) + for ( wxModuleList::iterator it = m_wxmodules.begin(); + it != m_wxmodules.end(); + ++it) { - if( !node->GetData()->Init() ) + if( !(*it)->Init() ) { wxLogDebug(_T("wxModule::Init() failed for wxPluginLibrary")); @@ -480,13 +499,14 @@ void wxPluginLibrary::RegisterModules() // let the dtor Exit the rest on shutdown, (which we'll initiate // shortly). - wxModuleList::Node *oldNode = 0; + wxModuleList::iterator oldNode = m_wxmodules.end(); do { - node = node->GetNext(); - delete oldNode; - wxModule::UnregisterModule( node->GetData() ); - oldNode = node; - } while( node ); + ++it; + if( oldNode != m_wxmodules.end() ) + m_wxmodules.erase(oldNode); + wxModule::UnregisterModule( *it ); + oldNode = it; + } while( it != m_wxmodules.end() ); --m_linkcount; // Flag us for deletion break; @@ -496,15 +516,15 @@ void wxPluginLibrary::RegisterModules() void wxPluginLibrary::UnregisterModules() { - wxModuleList::Node *node; + wxModuleList::iterator it; - for(node = m_wxmodules.GetFirst(); node; node->GetNext()) - node->GetData()->Exit(); + for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it ) + (*it)->Exit(); - for(node = m_wxmodules.GetFirst(); node; node->GetNext()) - wxModule::UnregisterModule( node->GetData() ); + for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it ) + wxModule::UnregisterModule( *it ); - m_wxmodules.DeleteContents(TRUE); + WX_CLEAR_LIST(wxModuleList, m_wxmodules); } @@ -534,7 +554,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags) } else { - entry = (wxPluginLibrary*) ms_manifest->Get(realname); + entry = FindByName(realname); } if ( entry ) @@ -550,7 +570,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags) if ( entry->IsLoaded() ) { - ms_manifest->Put(realname, (wxObject*) entry); + (*ms_manifest)[realname] = entry; wxLogTrace(_T("dll"), _T("LoadLibrary(%s): loaded ok."), realname.c_str()); @@ -579,13 +599,13 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) { wxString realname = libname; - wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest->Get(realname); + wxPluginLibrary *entry = FindByName(realname); if ( !entry ) { realname += wxDynamicLibrary::GetDllExt(); - entry = (wxPluginLibrary*) ms_manifest->Get(realname); + entry = FindByName(realname); } if ( !entry ) @@ -604,7 +624,7 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) return FALSE; } - ms_manifest->Delete(realname); + ms_manifest->erase(ms_manifest->find(realname)); return TRUE; } @@ -612,12 +632,15 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) #if WXWIN_COMPATIBILITY_2_2 wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle) { - wxNode *node; - ms_manifest->BeginFind(); + for ( wxDLManifest::iterator i = ms_manifest->begin(); + i != ms_manifest->end(); + ++i ) + { + wxPluginLibrary * const lib = i->second; - for(node = ms_manifest->Next(); node; node = ms_manifest->Next()) - if( ((wxPluginLibrary*)node->GetData())->GetLibHandle() == handle ) - return (wxPluginLibrary*)node->GetData(); + if ( lib->GetLibHandle() == handle ) + return lib; + } return NULL; } @@ -630,25 +653,28 @@ wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle) bool wxPluginManager::Load(const wxString &libname, int flags) { m_entry = wxPluginManager::LoadLibrary(libname, flags); + return IsLoaded(); } void wxPluginManager::Unload() { - wxNode *node; - ms_manifest->BeginFind(); - - // It's either this or store the name of the lib just to do this. - - for(node = ms_manifest->Next(); node; node = ms_manifest->Next()) - if( (wxPluginLibrary*)node->GetData() == m_entry ) - break; + wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") ); - if( m_entry && m_entry->UnrefLib() ) + for ( wxDLManifest::iterator i = ms_manifest->begin(); + i != ms_manifest->end(); + ++i ) { - delete node; - m_entry = 0; + if ( i->second == m_entry ) + { + ms_manifest->erase(i); + break; + } } + + m_entry->UnrefLib(); + + m_entry = NULL; } // --------------------------------------------------------------------------- @@ -657,7 +683,7 @@ void wxPluginManager::Unload() #if WXWIN_COMPATIBILITY_2_2 -wxDllType wxDllLoader::LoadLibrary(const wxString &name) +wxDllType wxDllLoader::LoadLibrary(const wxString &name, bool *success) { wxPluginLibrary *p = wxPluginManager::LoadLibrary ( @@ -665,6 +691,9 @@ wxDllType wxDllLoader::LoadLibrary(const wxString &name) wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE ); + if ( success ) + *success = p != NULL; + return p ? p->GetLibHandle() : 0; }