#include "wx/wxprec.h"
-#ifdef __BORLANDC__
-# pragma hdrstop
-#endif //__BORLANDC__
-
+#ifdef __BORLANDC__
+ #pragma hdrstop
+#endif
#if wxUSE_DYNLIB_CLASS
#include "wx/dynlib.h"
// ----------------------------------------------------------------------------
#if defined(HAVE_DLOPEN)
-# define wxDllOpen(lib) dlopen(lib.fn_str(), RTLD_LAZY)
+# define wxDllOpen(lib) dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
# define wxDllGetSymbol(handle, name) dlsym(handle, name.mb_str())
# define wxDllClose dlclose
#elif defined(HAVE_SHL_LOAD)
# endif // Win32/16
# define wxDllGetSymbol(handle, name) ::GetProcAddress(handle, name)
# define wxDllClose ::FreeLibrary
+
+#elif defined(__OS2__)
+
+# define INCL_DOS
+# include <os2.h>
+# define wxDllOpen(error, lib, handle) DosLoadModule(error, sizeof(error), lib, &handle)
+# define wxDllGetSymbol(handle, modaddr) DosQueryProcAddr(handle, 1L, NULL, (PFN*)modaddr)
+# define wxDllClose(handle) DosFreeModule(handle)
#else
# error "Don't know how to load shared libraries on this platform."
#endif // OS
# else //__HPUX__
fullname << ".so";
# endif //__HPUX__
-#elif defined(__WINDOWS__)
+#elif defined(__WINDOWS__) || defined(__OS2__)
fullname << ".dll";
#endif
/* static */
wxDllType
-wxDllLoader::LoadLibrary(const wxString & lib_name, bool *success)
+wxDllLoader::GetProgramHandle(void)
+{
+#if defined( HAVE_DLOPEN )
+ // optain handle for main program
+ return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
+#elif defined (HAVE_SHL_LOAD)
+ // shl_findsymbol with NULL handle looks up in main program
+ return 0;
+#else
+ wxFAIL_MSG(_("This method is not implemented under Windows or OS/2"));
+ return 0;
+#endif
+}
+
+/* static */
+wxDllType
+wxDllLoader::LoadLibrary(const wxString & libname, bool *success)
{
- wxASSERT(success);
-
- wxDllType handle;
+ wxDllType handle;
#if defined(__WXMAC__)
- FSSpec myFSSpec ;
- Ptr myMainAddr ;
- Str255 myErrName ;
-
- wxMacPathToFSSpec( lib_name , &myFSSpec ) ;
- if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
- myErrName ) != noErr )
- {
- p2cstr( myErrName ) ;
- wxASSERT_MSG( 1 , (char*)myErrName ) ;
- return NULL ;
- }
+ FSSpec myFSSpec ;
+ Ptr myMainAddr ;
+ Str255 myErrName ;
+
+ wxMacPathToFSSpec( libname , &myFSSpec ) ;
+ if (GetDiskFragment( &myFSSpec , 0 , kCFragGoesToEOF , "\p" , kPrivateCFragCopy , &handle , &myMainAddr ,
+ myErrName ) != noErr )
+ {
+ p2cstr( myErrName ) ;
+ wxASSERT_MSG( 1 , (char*)myErrName ) ;
+ return NULL ;
+ }
+#elif defined(__OS2__)
+ char zError[256] = "";
+ wxDllOpen(zError, libname, handle);
#else // !Mac
- handle = wxDllOpen(lib_name);
+ handle = wxDllOpen(libname);
#endif // OS
- if ( !handle )
- {
- wxLogSysError(_("Failed to load shared library '%s'"),
- lib_name.c_str());
- *success = FALSE;
- return NULL;
- }
- *success = TRUE;
- return handle;
+ if ( !handle )
+ {
+ wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str());
+ }
+
+ if ( success )
+ {
+ *success = handle != 0;
+ }
+
+ return handle;
+}
+
+
+/* static */
+void
+wxDllLoader::UnloadLibrary(wxDllType handle)
+{
+ wxDllClose(handle);
}
/* static */
void *
wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
{
- void *symbol = NULL; // return value
+ void *symbol = NULL; // return value
#if defined( __WXMAC__ )
- Ptr symAddress ;
- CFragSymbolClass symClass ;
- Str255 symName ;
-
- strcpy( (char*) symName , name ) ;
- c2pstr( (char*) symName ) ;
-
- if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
- symbol = (void *)symAddress ;
+ Ptr symAddress ;
+ CFragSymbolClass symClass ;
+ Str255 symName ;
+
+ strcpy( (char*) symName , name ) ;
+ c2pstr( (char*) symName ) ;
+
+ if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
+ symbol = (void *)symAddress ;
+#elif defined( __OS2__ )
+ wxDllGetSymbol(dllHandle, symbol);
#else
symbol = wxDllGetSymbol(dllHandle, name);
#endif
if ( !symbol )
{
- wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
- name.c_str());
+ wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
+ name.c_str());
}
return symbol;
}
// wxLibraries (only one instance should normally exist)
// ---------------------------------------------------------------------------
-wxLibraries::wxLibraries()
+wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)
{
}
wxLibrary *lib;
wxClassInfo *old_sm_first;
+#if defined(__VISAGECPP__)
+ node = m_loaded.Find(name.GetData());
+ if (node != NULL)
+ return ((wxLibrary *)node->Data());
+#else // !OS/2
if ( (node = m_loaded.Find(name.GetData())) )
return ((wxLibrary *)node->Data());
-
+#endif
// If DLL shares data, this is necessary.
old_sm_first = wxClassInfo::sm_first;
wxClassInfo::sm_first = NULL;
- wxString lib_name = ConstructLibraryName(name);
+ wxString libname = ConstructLibraryName(name);
/*
Unix automatically builds that library name, at least for dlopen()
const char *envLibPath = getenv("LD_LIBRARY_PATH");
if ( envLibPath )
libPath << ':' << envLibPath;
- wxStringTokenizer tokenizer(libPath, _T(':'));
+ wxStringTokenizer tokenizer(libPath, wxT(':'));
while ( tokenizer.HasMoreToken() )
{
wxString fullname(tokenizer.NextToken());
- fullname << '/' << lib_name;
+ fullname << '/' << libname;
if ( wxFileExists(fullname) )
{
- lib_name = fullname;
+ libname = fullname;
// found the library
break;
#endif
bool success = FALSE;
- wxDllType handle = wxDllLoader::LoadDll(lib_name, &success);
+ wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);
if(success)
{
lib = new wxLibrary(handle);
projects / wxWidgets.git / blobdiff