// Created: 03/12/01
// RCS-ID: $Id$
// Copyright: (c) 2001 Ron Lee <ron@debian.org>
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)
#pragma implementation "dynload.h"
#endif
#ifndef WX_PRECOMP
#include "wx/log.h"
#include "wx/intl.h"
+ #include "wx/hash.h"
+ #include "wx/utils.h"
#endif
-#include "wx/filename.h" // for SplitPath()
+#include "wx/strconv.h"
#include "wx/dynload.h"
+#include "wx/module.h"
-// ============================================================================
-// implementation
-// ============================================================================
// ---------------------------------------------------------------------------
-// wxDynamicLibrary
+// wxPluginLibrary
// ---------------------------------------------------------------------------
-//FIXME: This class isn't really common at all, it should be moved into
-// platform dependent files.
-#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
-const wxString wxDynamicLibrary::ms_dllext( _T(".dll") );
-#elif defined(__UNIX__)
-#if defined(__HPUX__)
-const wxString wxDynamicLibrary::ms_dllext( _T(".sl") );
-#else
-const wxString wxDynamicLibrary::ms_dllext( _T(".so") );
-#endif
-#endif
+wxDLImports* wxPluginLibrary::ms_classes = NULL;
-wxDllType wxDynamicLibrary::GetProgramHandle()
+class wxPluginLibraryModule : public wxModule
{
-#if defined( HAVE_DLOPEN ) && !defined(__EMX__)
- return dlopen(0, RTLD_LAZY);
-#elif defined (HAVE_SHL_LOAD)
- return PROG_HANDLE;
-#else
- wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));
- return 0;
-#endif
-}
-
-bool wxDynamicLibrary::Load(wxString libname, int flags)
-{
- wxASSERT_MSG(m_handle == 0, _T("Library already loaded."));
-
- // add the proper extension for the DLL ourselves unless told not to
- if ( !(flags & wxDL_VERBATIM) )
- {
- // and also check that the libname doesn't already have it
- wxString ext;
- wxFileName::SplitPath(libname, NULL, NULL, &ext);
- if ( ext.empty() )
- {
- libname += GetDllExt();
- }
- }
+public:
+ wxPluginLibraryModule() { }
-#if defined(__WXMAC__) && !defined(__UNIX__)
- FSSpec myFSSpec;
- Ptr myMainAddr;
- Str255 myErrName;
-
- wxMacFilename2FSSpec( libname , &myFSSpec );
-
- if( GetDiskFragment( &myFSSpec,
- 0,
- kCFragGoesToEOF,
- "\p",
- kPrivateCFragCopy,
- &m_handle,
- &myMainAddr,
- myErrName ) != noErr )
+ // TODO: create ms_classes on demand, why always preallocate it?
+ virtual bool OnInit()
{
- p2cstr( myErrName );
- wxLogSysError( _("Failed to load shared library '%s' Error '%s'"),
- libname.c_str(),
- (char*)myErrName );
- m_handle = 0;
- }
-
-#elif defined(__WXPM__) || defined(__EMX__)
- char err[256] = "";
- DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle)
-
-#elif defined(HAVE_DLOPEN)
-
-#ifdef __VMS
- m_handle = dlopen(libname.c_str(), 0); // The second parameter is ignored
-#else
- int rtldFlags = 0;
-
- if( flags & wxDL_LAZY )
- {
- wxASSERT_MSG( (flags & wxDL_NOW) == 0,
- _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
- rtldFlags |= RTLD_LAZY;
- }
- else if( flags & wxDL_NOW )
- {
- rtldFlags |= RTLD_NOW;
- }
- if( flags & wxDL_GLOBAL )
- {
-#ifdef __osf__
- wxLogDebug(_T("WARNING: RTLD_GLOBAL is not a supported on this platform."));
-#endif
- rtldFlags |= RTLD_GLOBAL;
- }
-
- m_handle = dlopen(libname.c_str(), rtldFlags);
-#endif // __VMS
-
-#elif defined(HAVE_SHL_LOAD)
- int shlFlags = 0;
-
- if( flags & wxDL_LAZY )
- {
- wxASSERT_MSG( (flags & wxDL_NOW) == 0,
- _T("wxDL_LAZY and wxDL_NOW are mutually exclusive.") );
- shlFlags |= BIND_DEFERRED;
- }
- else if( flags & wxDL_NOW )
- {
- shlFlags |= BIND_IMMEDIATE;
- }
- m_handle = shl_load(libname.c_str(), BIND_DEFERRED, 0);
-
-#elif defined(__DARWIN__)
- NSObjectFileImage ofile;
- int dyld_result = NSCreateObjectFileImageFromFile(libname.c_str(), &ofile);
-
- if (dyld_result != NSObjectFileImageSuccess)
- {
- TranslateError(libname.c_str(), OFImage, dyld_result);
- }
- else
- {
- // NSLinkModule will cause the run to abort on any link error's
- // not very friendly but the error recovery functionality is limited.
- m_handle = NSLinkModule(ofile, libname.c_str(), TRUE);
- }
-
-#elif defined(__WINDOWS__)
- m_handle = ::LoadLibrary(libname.c_str());
-
-#else
-#error "runtime shared lib support not implemented"
-#endif
-
- if ( m_handle == 0 )
- {
- wxString msg(_("Failed to load shared library '%s'"));
-#ifdef HAVE_DLERROR
- const wxChar *err = dlerror();
- if( err )
- wxLogError( msg, err );
-#else
- wxLogSysError( msg, libname.c_str() );
-#endif
- }
-
- return IsLoaded();
-}
-
-void wxDynamicLibrary::Unload()
-{
- if( IsLoaded() )
- {
-#if defined(__WXPM__) || defined(__EMX__)
- DosFreeModule( m_handle );
-#elif defined(HAVE_DLOPEN)
- dlclose( m_handle );
-#elif defined(HAVE_SHL_LOAD)
- shl_unload( m_handle );
-#elif defined(__WINDOWS__)
- ::FreeLibrary( m_handle );
-#elif defined(__WXMAC__)
- CloseConnection( &m_handle );
-#else
-#error "runtime shared lib support not implemented"
-#endif
- m_handle = 0;
+ wxPluginLibrary::ms_classes = new wxDLImports;
+ wxPluginManager::CreateManifest();
+ return TRUE;
}
-}
-void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
-{
- wxCHECK_MSG( IsLoaded(), NULL,
- _T("Can't load symbol from unloaded library") );
-
- bool failed = FALSE;
- void *symbol = 0;
-
-#if defined(__WXMAC__) && !defined(__UNIX__)
- Ptr symAddress;
- CFragSymbolClass symClass;
- Str255 symName;
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) symName, name );
-#else
- strcpy( (char *)symName, name );
- c2pstr( (char *)symName );
-#endif
- if( FindSymbol( dllHandle, symName, &symAddress, &symClass ) == noErr )
- symbol = (void *)symAddress;
-
-#elif defined(__WXPM__) || defined(__EMX__)
- DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol );
-
-#elif defined(HAVE_DLOPEN)
- symbol = dlsym( m_handle, name.c_str() );
-
-#elif defined(HAVE_SHL_LOAD)
- if( shl_findsym( &m_handle, name.c_str(), TYPE_UNDEFINED, &symbol ) != 0 )
- symbol = 0;
-
-#elif defined(__DARWIN__)
- if( NSIsSymbolNameDefined( name.c_str() ) )
- symbol = NSAddressOfSymbol( NSLookupAndBindSymbol( name.c_str() ) );
-
-#elif defined(__WINDOWS__)
- symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() );
-
-#else
-#error "runtime shared lib support not implemented"
-#endif
-
- if ( !symbol )
+ virtual void OnExit()
{
- wxString msg(_("wxDynamicLibrary failed to GetSymbol '%s'"));
-#ifdef HAVE_DLERROR
- const wxChar *err = dlerror();
- if( err )
- {
- failed = TRUE;
- wxLogError( msg, err );
- }
-#else
- failed = TRUE;
- wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
- name.c_str());
-#endif
+ delete wxPluginLibrary::ms_classes;
+ wxPluginLibrary::ms_classes = NULL;
+ wxPluginManager::ClearManifest();
}
- if( success )
- *success = !failed;
-
- return symbol;
-}
+private:
+ DECLARE_DYNAMIC_CLASS(wxPluginLibraryModule )
+};
-// ---------------------------------------------------------------------------
-// wxPluginLibrary
-// ---------------------------------------------------------------------------
-
+IMPLEMENT_DYNAMIC_CLASS(wxPluginLibraryModule, wxModule)
-wxDLImports wxPluginLibrary::ms_classes(wxKEY_STRING);
wxPluginLibrary::wxPluginLibrary(const wxString &libname, int flags)
: m_linkcount(1)
if( m_handle != 0 )
{
- UpdateClassInfo();
+ UpdateClasses();
RegisterModules();
}
else
- --m_linkcount; // Flag us for deletion
+ {
+ // Flag us for deletion
+ --m_linkcount;
+ }
}
wxPluginLibrary::~wxPluginLibrary()
if( m_handle != 0 )
{
UnregisterModules();
- RestoreClassInfo();
+ RestoreClasses();
}
}
+wxPluginLibrary *wxPluginLibrary::RefLib()
+{
+ wxCHECK_MSG( m_linkcount > 0, NULL,
+ _T("Library had been already deleted!") );
+
+ ++m_linkcount;
+ return this;
+}
+
bool wxPluginLibrary::UnrefLib()
{
- wxASSERT_MSG( m_objcount == 0, _T("Library unloaded before all objects were destroyed") );
- if( m_linkcount == 0 || --m_linkcount == 0 )
+ wxASSERT_MSG( m_objcount == 0,
+ _T("Library unloaded before all objects were destroyed") );
+
+ if ( --m_linkcount == 0 )
{
delete this;
return TRUE;
}
+
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( 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.
-
- if( ms_classes.Get(info->m_className) == 0 )
- ms_classes.Put(info->m_className, (wxObject *) this);
+ (*ms_classes)[info->m_className] = this;
}
}
-
- 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);
- }
}
-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.Delete(info->m_className);
- }
-
- 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->m_className));
}
}
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)) )
{
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"));
// 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;
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);
}
// ---------------------------------------------------------------------------
-// wxPluginLibrary
+// wxPluginManager
// ---------------------------------------------------------------------------
-wxDLManifest wxPluginManager::ms_manifest(wxKEY_STRING);
+wxDLManifest* wxPluginManager::ms_manifest = NULL;
// ------------------------
// Static accessors
// ------------------------
-wxPluginLibrary *wxPluginManager::LoadLibrary(const wxString &libname, int flags)
+wxPluginLibrary *
+wxPluginManager::LoadLibrary(const wxString &libname, int flags)
{
wxString realname(libname);
if( !(flags & wxDL_VERBATIM) )
realname += wxDynamicLibrary::GetDllExt();
- wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest.Get(realname);
+ wxPluginLibrary *entry;
- if( entry != 0 )
+ if ( flags & wxDL_NOSHARE )
{
+ entry = NULL;
+ }
+ else
+ {
+ entry = FindByName(realname);
+ }
+
+ if ( entry )
+ {
+ wxLogTrace(_T("dll"),
+ _T("LoadLibrary(%s): already loaded."), realname.c_str());
+
entry->RefLib();
}
else
{
entry = new wxPluginLibrary( libname, flags );
- if( entry->IsLoaded() )
+ if ( entry->IsLoaded() )
{
- ms_manifest.Put(realname, (wxObject*) entry);
+ (*ms_manifest)[realname] = entry;
+
+ wxLogTrace(_T("dll"),
+ _T("LoadLibrary(%s): loaded ok."), realname.c_str());
+
}
else
{
- wxCHECK_MSG( entry->UnrefLib(), 0,
- _T("Currently linked library is, ..not loaded??") );
- entry = 0;
+ wxLogTrace(_T("dll"),
+ _T("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?") );
+ }
+
+ entry = NULL;
}
}
+
return entry;
}
-bool wxPluginManager::UnloadLibrary(const wxString &libname)
+bool wxPluginManager::UnloadLibrary(const wxString& libname)
{
- wxPluginLibrary *entry = (wxPluginLibrary*) ms_manifest.Get(libname);
+ wxString realname = libname;
+
+ wxPluginLibrary *entry = FindByName(realname);
+
+ if ( !entry )
+ {
+ realname += wxDynamicLibrary::GetDllExt();
- if( !entry )
- entry = (wxPluginLibrary*) ms_manifest.Get(libname + wxDynamicLibrary::GetDllExt());
+ entry = FindByName(realname);
+ }
- if( entry )
- return entry->UnrefLib();
+ if ( !entry )
+ {
+ wxLogDebug(_T("Attempt to unload library '%s' which is not loaded."),
+ libname.c_str());
- wxLogDebug(_T("Attempt to Unlink library '%s' (which is not linked)."), libname.c_str());
- return FALSE;
-}
+ return FALSE;
+ }
-#if WXWIN_COMPATIBILITY_2_2
-wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
-{
- wxNode *node;
- ms_manifest.BeginFind();
+ wxLogTrace(_T("dll"), _T("UnloadLibrary(%s)"), realname.c_str());
- for(node = ms_manifest.Next(); node; node = ms_manifest.Next())
- if( ((wxPluginLibrary*)node->GetData())->GetLibHandle() == handle )
- return (wxPluginLibrary*)node->GetData();
+ if ( !entry->UnrefLib() )
+ {
+ // not really unloaded yet
+ return FALSE;
+ }
- return 0;
+ ms_manifest->erase(ms_manifest->find(realname));
+
+ return TRUE;
}
-#endif
// ------------------------
// Class implementation
bool wxPluginManager::Load(const wxString &libname, int flags)
{
m_entry = wxPluginManager::LoadLibrary(libname, flags);
+
return IsLoaded();
}
void wxPluginManager::Unload()
{
- wxNode *node;
- ms_manifest.BeginFind();
+ wxCHECK_RET( m_entry, _T("unloading an invalid wxPluginManager?") );
- // 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 )
+ for ( wxDLManifest::iterator i = ms_manifest->begin();
+ i != ms_manifest->end();
+ ++i )
+ {
+ if ( i->second == m_entry )
+ {
+ ms_manifest->erase(i);
break;
+ }
+ }
+
+ m_entry->UnrefLib();
+
+ m_entry = NULL;
+}
+
- if( m_entry && m_entry->UnrefLib() )
+
+#if WXWIN_COMPATIBILITY_2_2
+
+wxPluginLibrary *wxPluginManager::GetObjectFromHandle(wxDllType handle)
+{
+ for ( wxDLManifest::iterator i = ms_manifest->begin();
+ i != ms_manifest->end();
+ ++i )
{
- delete node;
- m_entry = 0;
+ 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);
}
-#ifdef __DARWIN__
// ---------------------------------------------------------------------------
-// For Darwin/Mac OS X
-// supply the sun style dlopen functions in terms of Darwin NS*
+// Global variables
// ---------------------------------------------------------------------------
-extern "C" {
-#import <mach-o/dyld.h>
-};
+wxLibraries wxTheLibraries;
+
+// ============================================================================
+// implementation
+// ============================================================================
-enum dyldErrorSource
+// 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)
{
- OFImage,
-};
+ wxString fullname;
+ fullname << basename << wxDllLoader::GetDllExt();
-static char dl_last_error[1024];
+ return fullname;
+}
-static void TranslateError(const char *path, enum dyldErrorSource type, int number)
+// ---------------------------------------------------------------------------
+// wxLibrary (one instance per dynamic library)
+// ---------------------------------------------------------------------------
+
+wxLibrary::wxLibrary(wxDllType handle)
{
- unsigned int index;
- static char *OFIErrorStrings[] =
+ 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 )
{
- "%s(%d): Object Image Load Failure\n",
- "%s(%d): Object Image Load Success\n",
- "%s(%d): Not an recognisable object file\n",
- "%s(%d): No valid architecture\n",
- "%s(%d): Object image has an invalid format\n",
- "%s(%d): Invalid access (permissions?)\n",
- "%s(%d): Unknown error code from NSCreateObjectFileImageFromFile\n",
- };
-#define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
-
- switch (type)
+ 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)
{
- case OFImage:
- index = number;
- if (index > NUM_OFI_ERRORS - 1) {
- index = NUM_OFI_ERRORS - 1;
- }
- sprintf(dl_last_error, OFIErrorStrings[index], path, number);
- break;
-
- default:
- sprintf(dl_last_error, "%s(%d): Totally unknown error type %d\n",
- path, number, type);
- break;
+ 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
}
-#endif // __DARWIN__
+void *wxLibrary::GetSymbol(const wxString& symbname)
+{
+ return wxDllLoader::GetSymbol(m_handle, symbname);
+}
// ---------------------------------------------------------------------------
-// wxDllLoader (all these methods are static)
+// wxLibraries (only one instance should normally exist)
// ---------------------------------------------------------------------------
-#if WXWIN_COMPATIBILITY_2_2
+wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
+{
+}
-wxDllType wxDllLoader::LoadLibrary(const wxString &name)
+wxLibraries::~wxLibraries()
{
- wxPluginLibrary *p = wxPluginManager::LoadLibrary(name, wxDL_DEFAULT | wxDL_VERBATIM);
- return p->GetLibHandle();
+ wxNode *node = m_loaded.First();
+
+ while (node) {
+ wxLibrary *lib = (wxLibrary *)node->Data();
+ delete lib;
+
+ node = node->Next();
+ }
}
-void wxDllLoader::UnloadLibrary(wxDllType handle)
+wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
{
- wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(handle);
- p->UnrefLib();
+ 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;
}
-void *wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name, bool *success)
+wxObject *wxLibraries::CreateObject(const wxString& path)
{
- wxPluginLibrary *p = wxPluginManager::GetObjectFromHandle(dllHandle);
- return p->GetSymbol(name, success);
+ 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
-// vi:sts=4:sw=4:et
projects / wxWidgets.git / blobdiff