X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/8907154c1a8a6882c6797d1f16393ddfb23e7f3a..57d3e26697255a5c5154b4a0dc26d6eab23ff871:/src/common/dynload.cpp diff --git a/src/common/dynload.cpp b/src/common/dynload.cpp index 562b6ce975..a76a190733 100644 --- a/src/common/dynload.cpp +++ b/src/common/dynload.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dynload.cpp +// Name: src/common/dynload.cpp // Purpose: Dynamic loading framework // Author: Ron Lee, David Falkinder, Vadim Zeitlin and a cast of 1000's // (derived in part from dynlib.cpp (c) 1998 Guilhem Lavaux) @@ -31,12 +31,12 @@ #include "wx/intl.h" #include "wx/hash.h" #include "wx/utils.h" + #include "wx/module.h" #endif #include "wx/strconv.h" #include "wx/dynload.h" -#include "wx/module.h" // --------------------------------------------------------------------------- @@ -61,8 +61,7 @@ public: virtual void OnExit() { - delete wxPluginLibrary::ms_classes; - wxPluginLibrary::ms_classes = NULL; + wxDELETE(wxPluginLibrary::ms_classes); wxPluginManager::ClearManifest(); } @@ -77,9 +76,9 @@ wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags) : m_linkcount(1) , m_objcount(0) { - m_before = wxClassInfo::sm_first; + m_before = wxClassInfo::GetFirst(); Load( libname, flags ); - m_after = wxClassInfo::sm_first; + m_after = wxClassInfo::GetFirst(); if( m_handle != 0 ) { @@ -105,7 +104,7 @@ wxPluginLibrary::~wxPluginLibrary() wxPluginLibrary *wxPluginLibrary::RefLib() { wxCHECK_MSG( m_linkcount > 0, NULL, - _T("Library had been already deleted!") ); + wxT("Library had been already deleted!") ); ++m_linkcount; return this; @@ -114,7 +113,7 @@ wxPluginLibrary *wxPluginLibrary::RefLib() bool wxPluginLibrary::UnrefLib() { wxASSERT_MSG( m_objcount == 0, - _T("Library unloaded before all objects were destroyed") ); + wxT("Library unloaded before all objects were destroyed") ); if ( m_linkcount == 0 || --m_linkcount == 0 ) { @@ -131,7 +130,7 @@ bool wxPluginLibrary::UnrefLib() void wxPluginLibrary::UpdateClasses() { - for (wxClassInfo *info = m_after; info != m_before; info = info->m_next) + for (const wxClassInfo *info = m_after; info != m_before; info = info->GetNext()) { if( info->GetClassName() ) { @@ -148,7 +147,7 @@ void wxPluginLibrary::RestoreClasses() if (!ms_classes) return; - for(wxClassInfo *info = m_after; info != m_before; info = info->m_next) + for(const wxClassInfo *info = m_after; info != m_before; info = info->GetNext()) { ms_classes->erase(ms_classes->find(info->GetClassName())); } @@ -165,15 +164,15 @@ void wxPluginLibrary::RegisterModules() // though, as there is currently no way to Unregister it without it. wxASSERT_MSG( m_linkcount == 1, - _T("RegisterModules should only be called for the first load") ); + wxT("RegisterModules should only be called for the first load") ); - for ( wxClassInfo *info = m_after; info != m_before; info = info->m_next) + for ( const wxClassInfo *info = m_after; info != m_before; info = info->GetNext()) { if( info->IsKindOf(CLASSINFO(wxModule)) ) { wxModule *m = wxDynamicCast(info->CreateObject(), wxModule); - wxASSERT_MSG( m, _T("wxDynamicCast of wxModule failed") ); + wxASSERT_MSG( m, wxT("wxDynamicCast of wxModule failed") ); m_wxmodules.push_back(m); wxModule::RegisterModule(m); @@ -188,7 +187,7 @@ void wxPluginLibrary::RegisterModules() { if( !(*it)->Init() ) { - wxLogDebug(_T("wxModule::Init() failed for wxPluginLibrary")); + wxLogDebug(wxT("wxModule::Init() failed for wxPluginLibrary")); // XXX: Watch this, a different hash implementation might break it, // a good hash implementation would let us fix it though. @@ -258,8 +257,8 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags) if ( entry ) { - wxLogTrace(_T("dll"), - _T("LoadLibrary(%s): already loaded."), realname.c_str()); + wxLogTrace(wxT("dll"), + wxT("LoadLibrary(%s): already loaded."), realname.c_str()); entry->RefLib(); } @@ -271,20 +270,20 @@ wxPluginManager::LoadLibrary(const wxString &libname, int flags) { (*ms_manifest)[realname] = entry; - wxLogTrace(_T("dll"), - _T("LoadLibrary(%s): loaded ok."), realname.c_str()); + wxLogTrace(wxT("dll"), + wxT("LoadLibrary(%s): loaded ok."), realname.c_str()); } else { - wxLogTrace(_T("dll"), - _T("LoadLibrary(%s): failed to load."), realname.c_str()); + wxLogTrace(wxT("dll"), + wxT("LoadLibrary(%s): failed to load."), realname.c_str()); // we have created entry just above if ( !entry->UnrefLib() ) { // ... so UnrefLib() is supposed to delete it - wxFAIL_MSG( _T("Currently linked library is not loaded?") ); + wxFAIL_MSG( wxT("Currently linked library is not loaded?") ); } entry = NULL; @@ -309,13 +308,13 @@ bool wxPluginManager::UnloadLibrary(const wxString& libname) if ( !entry ) { - wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."), + wxLogDebug(wxT("Attempt to unload library '%s' which is not loaded."), libname.c_str()); return false; } - wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str()); + wxLogTrace(wxT("dll"), wxT("UnloadLibrary(%s)"), realname.c_str()); if ( !entry->UnrefLib() ) { @@ -341,7 +340,7 @@ bool wxPluginManager::Load(const wxString &libname, int flags) void wxPluginManager::Unload() { - wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") ); + wxCHECK_RET( m_entry, wxT("unloading an invalid wxPluginManager?") ); for ( wxDLManifest::iterator i = ms_manifest->begin(); i != ms_manifest->end(); @@ -359,225 +358,4 @@ void wxPluginManager::Unload() 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 wxWidgets 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 - // 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.GetFirst(); - - while (node) { - wxLibrary *lib = (wxLibrary *)node->GetData(); - delete lib; - - node = node->GetNext(); - } -} - -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->GetData()); - - // 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.GetFirst(); - wxObject *obj; - - while (node) { - obj = ((wxLibrary *)node->GetData())->CreateObject(path); - if (obj) - return obj; - - node = node->GetNext(); - } - return NULL; -} - -#endif // WXWIN_COMPATIBILITY_2_2 - - #endif // wxUSE_DYNAMIC_LOADER -