X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8e11fbb0103958ec589a9347ddde406b5e6c0e78..fe164c3e2ea5453896cd63a5440a26365daec1bc:/src/common/dynload.cpp diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index aa917ba051..65bdd6ddb4 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,6 +33,7 @@ #ifndef WX_PRECOMP #include "wx/log.h" #include "wx/intl.h" + #include "wx/hash.h" #endif #include "wx/filename.h" // for SplitPath() @@ -263,7 +264,10 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const symbol = dlsym( m_handle, name.fn_str() ); #elif defined(HAVE_SHL_LOAD) - if( shl_findsym( &m_handle, name.fn_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__) @@ -275,7 +279,6 @@ 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 @@ -287,8 +290,7 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const if( err ) { - failed = TRUE; - wxLogError( msg, err ); + wxLogError(wxT("%s"), err); } #else failed = TRUE; @@ -416,9 +418,7 @@ 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; } } @@ -438,7 +438,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 ) @@ -467,7 +467,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)) ) { @@ -475,16 +475,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")); @@ -495,13 +497,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; @@ -511,15 +514,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); } @@ -549,7 +552,7 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags) } else { - entry = (wxPluginLibrary*) ms_manifest->Get(realname); + entry = FindByName(realname); } if ( entry ) @@ -565,7 +568,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()); @@ -594,13 +597,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 ) @@ -619,7 +622,7 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) return FALSE; } - ms_manifest->Delete(realname); + ms_manifest->erase(ms_manifest->find(realname)); return TRUE; } @@ -627,12 +630,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; } @@ -645,25 +651,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. + wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") ); - for(node = ms_manifest->Next(); node; node = ms_manifest->Next()) - if( (wxPluginLibrary*)node->GetData() == m_entry ) - break; - - 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; } // ---------------------------------------------------------------------------