// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
-#pragma implementation "dynload.h"
-#endif
-
// ----------------------------------------------------------------------------
// headers
// ----------------------------------------------------------------------------
// TODO: create ms_classes on demand, why always preallocate it?
virtual bool OnInit()
{
- wxPluginLibrary::ms_classes = new wxDLImports(wxKEY_STRING);
+ wxPluginLibrary::ms_classes = new wxDLImports;
wxPluginManager::CreateManifest();
- return TRUE;
+ return true;
}
virtual void OnExit()
if( m_handle != 0 )
{
- UpdateClassInfo();
+ UpdateClasses();
RegisterModules();
}
else
if( m_handle != 0 )
{
UnregisterModules();
- RestoreClassInfo();
+ RestoreClasses();
}
}
wxASSERT_MSG( m_objcount == 0,
_T("Library unloaded before all objects were destroyed") );
- if ( --m_linkcount == 0 )
+ if ( m_linkcount == 0 || --m_linkcount == 0 )
{
delete this;
- return TRUE;
+ return true;
}
- return FALSE;
+ return false;
}
// ------------------------
// Private methods
// ------------------------
-void wxPluginLibrary::UpdateClassInfo()
+void wxPluginLibrary::UpdateClasses()
{
- wxClassInfo *info;
- wxHashTable *t = wxClassInfo::sm_classTable;
-
- // FIXME: Below is simply a cut and paste specialisation of
- // wxClassInfo::InitializeClasses. Once this stabilises,
- // the two should probably be merged.
- //
- // Actually it's becoming questionable whether we should merge
- // this info with the main ClassInfo tables since we can nearly
- // handle this completely internally now and it does expose
- // certain (minimal % user_stupidy) risks.
-
- for(info = m_after; info != m_before; info = info->m_next)
+ for (wxClassInfo *info = m_after; info != m_before; info = info->m_next)
{
- if( info->m_className )
+ if( info->GetClassName() )
{
- if( t->Get(info->m_className) == 0 )
- t->Put(info->m_className, (wxObject *)info);
-
// Hash all the class names into a local table too so
// we can quickly find the entry they correspond to.
- (*ms_classes)[info->m_className] = this;
+ (*ms_classes)[info->GetClassName()] = this;
}
}
-
-#if wxUSE_EXTENDED_RTTI == 0
- for(info = m_after; info != m_before; info = info->m_next)
- {
- if( info->m_baseClassName1 )
- info->m_baseInfo1 = (wxClassInfo *)t->Get(info->m_baseClassName1);
- if( info->m_baseClassName2 )
- info->m_baseInfo2 = (wxClassInfo *)t->Get(info->m_baseClassName2);
- }
-#endif
}
-void wxPluginLibrary::RestoreClassInfo()
+void wxPluginLibrary::RestoreClasses()
{
- wxClassInfo *info;
-
- for(info = m_after; info != m_before; info = info->m_next)
- {
- wxClassInfo::sm_classTable->Delete(info->m_className);
- ms_classes->erase(ms_classes->find(info->m_className));
- }
+ // Check if there is a need to restore classes.
+ if (!ms_classes)
+ return;
- if( wxClassInfo::sm_first == m_after )
- wxClassInfo::sm_first = m_before;
- else
+ for(wxClassInfo *info = m_after; info != m_before; info = info->m_next)
{
- info = wxClassInfo::sm_first;
- while( info->m_next && info->m_next != m_after ) info = info->m_next;
-
- wxASSERT_MSG( info, _T("ClassInfo from wxPluginLibrary not found on purge"));
-
- info->m_next = m_before;
+ ms_classes->erase(ms_classes->find(info->GetClassName()));
}
}
for ( it = m_wxmodules.begin(); it != m_wxmodules.end(); ++it )
wxModule::UnregisterModule( *it );
- WX_CLEAR_LIST(wxModuleList, m_wxmodules);
+ // NB: content of the list was deleted by UnregisterModule calls above:
+ m_wxmodules.clear();
}
wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."),
libname.c_str());
- return FALSE;
+ return false;
}
wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str());
if ( !entry->UnrefLib() )
{
// not really unloaded yet
- return FALSE;
+ return false;
}
ms_manifest->erase(ms_manifest->find(realname));
- return TRUE;
+ return true;
}
// ------------------------
m_entry = NULL;
}
-
-
-#if WXWIN_COMPATIBILITY_2_2
-
-wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
-{
- for ( wxDLManifest::iterator i = ms_manifest->begin();
- i != ms_manifest->end();
- ++i )
- {
- wxPluginLibrary * const lib = i->second;
-
- if ( lib->GetLibHandle() == handle )
- return lib;
- }
-
- return NULL;
-}
-
-// ---------------------------------------------------------------------------
-// wxDllLoader (all these methods are static)
-// ---------------------------------------------------------------------------
-
-
-wxDllType wxDllLoader::LoadLibrary(const wxString &name, bool *success)
-{
- wxPluginLibrary *p = wxPluginManager::LoadLibrary
- (
- name,
- wxDL_DEFAULT | wxDL_VERBATIM | wxDL_NOSHARE
- );
-
- if ( success )
- *success = p != NULL;
-
- return p ? p->GetLibHandle() : 0;
-}
-
-void wxDllLoader::UnloadLibrary(wxDllType handle)
-{
- wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(handle);
-
- wxCHECK_RET( p, _T("Unloading a library not loaded with wxDllLoader?") );
-
- p->UnrefLib();
-}
-
-void *
-wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *success)
-{
- wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(dllHandle);
-
- if ( !p )
- {
- wxFAIL_MSG( _T("Using a library not loaded with wxDllLoader?") );
-
- if ( success )
- *success = FALSE;
-
- return NULL;
- }
-
- return p->GetSymbol(name, success);
-}
-
-
-// ---------------------------------------------------------------------------
-// Global variables
-// ---------------------------------------------------------------------------
-
-wxLibraries wxTheLibraries;
-
-// ============================================================================
-// implementation
-// ============================================================================
-
-// construct the full name from the base shared object name: adds a .dll
-// suffix under Windows or .so under Unix
-static wxString ConstructLibraryName(const wxString& basename)
-{
- wxString fullname;
- fullname << basename << wxDllLoader::GetDllExt();
-
- return fullname;
-}
-
-// ---------------------------------------------------------------------------
-// wxLibrary (one instance per dynamic library)
-// ---------------------------------------------------------------------------
-
-wxLibrary::wxLibrary(wxDllType handle)
-{
- typedef wxClassInfo *(*t_get_first)(void);
- t_get_first get_first;
-
- m_handle = handle;
-
- // Some system may use a local heap for library.
- get_first = (t_get_first)GetSymbol(_T("wxGetClassFirst"));
- // It is a wxWindows DLL.
- if (get_first)
- PrepareClasses(get_first());
-}
-
-wxLibrary::~wxLibrary()
-{
- if ( m_handle )
- {
- wxDllLoader::UnloadLibrary(m_handle);
- }
-}
-
-wxObject *wxLibrary::CreateObject(const wxString& name)
-{
- wxClassInfo *info = (wxClassInfo *)classTable.Get(name);
-
- if (!info)
- return NULL;
-
- return info->CreateObject();
-}
-
-void wxLibrary::PrepareClasses(wxClassInfo *first)
-{
- // Index all class infos by their class name
- wxClassInfo *info = first;
- while (info)
- {
- if (info->m_className)
- classTable.Put(info->m_className, (wxObject *)info);
- info = info->m_next;
- }
-
-#if wxUSE_EXTENDED_RTTI == 0
- // Set base pointers for each wxClassInfo
- info = first;
- while (info)
- {
- if (info->GetBaseClassName1())
- info->m_baseInfo1 = (wxClassInfo *)classTable.Get(info->GetBaseClassName1());
- if (info->GetBaseClassName2())
- info->m_baseInfo2 = (wxClassInfo *)classTable.Get(info->GetBaseClassName2());
- info = info->m_next;
- }
-#endif
-}
-
-void *wxLibrary::GetSymbol(const wxString& symbname)
-{
- return wxDllLoader::GetSymbol(m_handle, symbname);
-}
-
-
-// ---------------------------------------------------------------------------
-// wxLibraries (only one instance should normally exist)
-// ---------------------------------------------------------------------------
-
-wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
-{
-}
-
-wxLibraries::~wxLibraries()
-{
- wxNode *node = m_loaded.First();
-
- while (node) {
- wxLibrary *lib = (wxLibrary *)node->Data();
- delete lib;
-
- node = node->Next();
- }
-}
-
-wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
-{
- wxLibrary *lib;
- wxClassInfo *old_sm_first;
- wxNode *node = m_loaded.Find(name.GetData());
-
- if (node != NULL)
- return ((wxLibrary *)node->Data());
-
- // If DLL shares data, this is necessary.
- old_sm_first = wxClassInfo::sm_first;
- wxClassInfo::sm_first = NULL;
-
- wxString libname = ConstructLibraryName(name);
-
- bool success = FALSE;
- wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);
- if(success)
- {
- lib = new wxLibrary(handle);
- wxClassInfo::sm_first = old_sm_first;
-
- m_loaded.Append(name.GetData(), lib);
- }
- else
- lib = NULL;
- return lib;
-}
-
-wxObject *wxLibraries::CreateObject(const wxString& path)
-{
- wxNode *node = m_loaded.First();
- wxObject *obj;
-
- while (node) {
- obj = ((wxLibrary *)node->Data())->CreateObject(path);
- if (obj)
- return obj;
-
- node = node->Next();
- }
- return NULL;
-}
-
-#endif // WXWIN_COMPATIBILITY_2_2
-
-
#endif // wxUSE_DYNAMIC_LOADER
projects / wxWidgets.git / blobdiff