Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix bug with unloading wxPluginLibrary objects in "wrong" order.

Browse Source 
wxPluginLibrary objects had to be unloaded in exactly the reverse order to
which they were loaded in. This was not documented and was a serious
limitation for any realistic use of plugins anyhow, so fix it and allow
unloading them in any order now.

Instead of keeping a pointer to the last wxClassInfo not created by this
plugin, now keep a pointer to the first wxClassInfo that was created by it.
This makes the code slightly more complex but this pointer, unlike the old
one, remains valid even if another plugin was unloaded.

Closes #14261.

git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@71571 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2012-05-26 12:29:54 +00:00
parent f0d38b659f
commit 7ed9cd2891
3 changed files with 57 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

61
src/common/dynload.cpp
View File

@@ -76,9 +76,32 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
: m_linkcount(1)
, m_objcount(0)
{
m_before = wxClassInfo::GetFirst();
const wxClassInfo* const oldFirst = wxClassInfo::GetFirst();
Load( libname, flags );
m_after = wxClassInfo::GetFirst();
// It is simple to know what is the last object we registered, it's just
// the new head of the wxClassInfo list:
m_ourLast = wxClassInfo::GetFirst();
// But to find the first wxClassInfo created by this library we need to
// iterate until we get to the previous head as we don't have the links in
// the backwards direction:
if ( m_ourLast != oldFirst )
{
for ( const wxClassInfo* info = m_ourLast; ; info = info->GetNext() )
{
if ( info->GetNext() == oldFirst )
{
m_ourFirst = info;
break;
}
}
}
else // We didn't register any classes at all.
{
m_ourFirst =
m_ourLast = NULL;
}
if( m_handle != 0 )
{
@@ -130,7 +153,10 @@ bool wxPluginLibrary::UnrefLib()
void wxPluginLibrary::UpdateClasses()
{
for (const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
if ( !m_ourFirst )
return;
for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
{
if( info->GetClassName() )
{
@@ -138,6 +164,9 @@ void wxPluginLibrary::UpdateClasses()
// we can quickly find the entry they correspond to.
(*ms_classes)[info->GetClassName()] = this;
}
if ( info == m_ourLast )
break;
}
}
@@ -147,9 +176,15 @@ void wxPluginLibrary::RestoreClasses()
if (!ms_classes)
return;
for(const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
if ( !m_ourFirst )
return;
for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
{
ms_classes->erase(ms_classes->find(info->GetClassName()));
if ( info == m_ourLast )
break;
}
}
@@ -166,16 +201,22 @@ void wxPluginLibrary::RegisterModules()
wxASSERT_MSG( m_linkcount == 1,
wxT("RegisterModules should only be called for the first load") );
for ( const wxClassInfo *info = m_after; info != m_before; info = info->GetNext())
if ( m_ourFirst )
{
if( info->IsKindOf(CLASSINFO(wxModule)) )
for ( const wxClassInfo *info = m_ourFirst; ; info = info->GetNext() )
{
wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
if( info->IsKindOf(CLASSINFO(wxModule)) )
{
wxModule *m = wxDynamicCast(info->CreateObject(), wxModule);
wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") );
m_wxmodules.push_back(m);
wxModule::RegisterModule(m);
m_wxmodules.push_back(m);
wxModule::RegisterModule(m);
}
if ( info == m_ourLast )
break;
}
}