Unicode overview added

[wxWidgets.git] / src / common / dynlib.cpp

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index b4a60768fb10eb2357b00c048ecfbae07d6bf25b..ab4f28a0497a2132f310612eba93a0cf086bc0ba 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -18,15 +18,14 @@
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__
 // ----------------------------------------------------------------------------
 
 #ifdef __GNUG__

-    #pragma implementation "dynlib.h"
+#   pragma implementation "dynlib.h"

 #endif
 
 #include  "wx/wxprec.h"
 
 #endif
 
 #include  "wx/wxprec.h"
 

-#ifdef    __BORLANDC__
+#ifdef __BORLANDC__

   #pragma hdrstop
   #pragma hdrstop

-#endif  //__BORLANDC__
-
+#endif

 #if wxUSE_DYNLIB_CLASS
 
 #include "wx/dynlib.h"
 #if wxUSE_DYNLIB_CLASS
 
 #include "wx/dynlib.h"


@@ -40,12 +39,12 @@
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)

-    #define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_LAZY)
-    #define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
-    #define wxDllClose                    dlclose
+#   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)
 #elif defined(HAVE_SHL_LOAD)

-    #define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
-    #define wxDllClose      shl_unload
+#   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
+#   define wxDllClose      shl_unload

 
     static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
     {
 
     static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)
     {


@@ -56,18 +55,26 @@
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return (void *)0;
     }
 #elif defined(__WINDOWS__)

-    #include <windows.h>
+#   include <windows.h>

 
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary

-    #ifdef __WIN32__
-        #define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
-    #else   // Win16
-        #define wxDllOpen(lib)                  ::LoadLibrary(lib)
-    #endif  // Win32/16
-    #define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
-    #define wxDllClose                      ::FreeLibrary
+#   ifdef __WIN32__
+#      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
+#   else   // Win16
+#      define wxDllOpen(lib)                  ::LoadLibrary(lib)
+#   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
 #else

-    #error "Don't know how to load shared libraries on this platform."
+#   error "Don't know how to load shared libraries on this platform."

 #endif // OS
 
 // ---------------------------------------------------------------------------
 #endif // OS
 
 // ---------------------------------------------------------------------------


@@ -87,12 +94,12 @@ static wxString ConstructLibraryName(const wxString& basename)
     wxString fullname(basename);
 
 #if defined(__UNIX__)
     wxString fullname(basename);
 
 #if defined(__UNIX__)

-    #if defined(__HPUX__)
+#   if defined(__HPUX__)

         fullname << ".sl";
         fullname << ".sl";

-    #else      //__HPUX__
+#   else       //__HPUX__

         fullname << ".so";
         fullname << ".so";

-    #endif     //__HPUX__
-#elif defined(__WINDOWS__)
+#   endif      //__HPUX__
+#elif defined(__WINDOWS__) || defined(__OS2__)

     fullname << ".dll";
 #endif
 
     fullname << ".dll";
 #endif
 


@@ -103,6 +110,7 @@ static wxString ConstructLibraryName(const wxString& basename)
 // implementation
 // ============================================================================
 
 // implementation
 // ============================================================================
 

+

 // ---------------------------------------------------------------------------
 // wxLibrary (one instance per dynamic library)
 // ---------------------------------------------------------------------------
 // ---------------------------------------------------------------------------
 // wxLibrary (one instance per dynamic library)
 // ---------------------------------------------------------------------------


@@ -163,6 +171,80 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
 }
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 }
 
 void *wxLibrary::GetSymbol(const wxString& symbname)

+{
+   return wxDllLoader::GetSymbol(m_handle, symbname);
+}
+
+// ---------------------------------------------------------------------------
+// wxDllLoader
+// ---------------------------------------------------------------------------
+
+/* static */
+wxDllType
+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)
+{
+    wxDllType handle;
+
+#if defined(__WXMAC__)
+    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(libname);
+#endif // OS
+
+    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
 


@@ -171,23 +253,22 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
     CFragSymbolClass symClass ;
     Str255     symName ;
 
     CFragSymbolClass symClass ;
     Str255     symName ;
 

-    strcpy( (char*) symName , symbname ) ;
+    strcpy( (char*) symName , name ) ;

     c2pstr( (char*) symName ) ;
 
     c2pstr( (char*) symName ) ;
 

-    if ( FindSymbol( m_handle , symName , &symAddress , &symClass ) == noErr )
-    {
-        symbol = (void *)symAddress ; 
-    }
+    if ( FindSymbol( dllHandle , symName , &symAddress , &symClass ) == noErr )
+        symbol = (void *)symAddress ;
+#elif defined( __OS2__ )
+    wxDllGetSymbol(dllHandle, symbol);

 #else
 #else

-    symbol = wxDllGetSymbol(m_handle, symbname);
+    symbol = wxDllGetSymbol(dllHandle, name);

 #endif
 
     if ( !symbol )
     {
         wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
 #endif
 
     if ( !symbol )
     {
         wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),

-                      symbname.c_str());
+                      name.c_str());

     }
     }

-

     return symbol;
 }
 
     return symbol;
 }
 


@@ -195,7 +276,7 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 

-wxLibraries::wxLibraries()
+wxLibraries::wxLibraries():m_loaded(wxKEY_STRING)

 {
 }
 
 {
 }
 


@@ -217,30 +298,39 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     wxLibrary *lib;
     wxClassInfo *old_sm_first;
 
     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());
     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;
 
     // 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()
+*/
+#if 0

 #if defined(__UNIX__)
     // found the first file in LD_LIBRARY_PATH with this name
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
         libPath << ':' << envLibPath;
 #if defined(__UNIX__)
     // found the first file in LD_LIBRARY_PATH with this name
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
         libPath << ':' << envLibPath;

-    wxStringTokenizer tokenizer(libPath, _T(':'));
+    wxStringTokenizer tokenizer(libPath, T(':'));

     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 
     while ( tokenizer.HasMoreToken() )
     {
         wxString fullname(tokenizer.NextToken());
 

-        fullname << '/' << lib_name;
+        fullname << '/' << libname;

         if ( wxFileExists(fullname) )
         {
         if ( wxFileExists(fullname) )
         {

-            lib_name = fullname;
+            libname = fullname;

 
             // found the library
             break;
 
             // found the library
             break;


@@ -249,40 +339,18 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     //else: not found in the path, leave the name as is (secutiry risk?)
 
 #endif // __UNIX__
     //else: not found in the path, leave the name as is (secutiry risk?)
 
 #endif // __UNIX__

+#endif

 
 

-    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 ;
-    }
-#else // !Mac
-    handle = wxDllOpen(lib_name);
-#endif // OS
-
-    if ( !handle )
+    bool success = FALSE;
+    wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);
+    if(success)

     {
     {

-        wxLogSysError(_("Failed to load shared library '%s'"),
-                      lib_name.c_str());
-
-        return NULL;
+       lib = new wxLibrary(handle);
+       wxClassInfo::sm_first = old_sm_first;
+       m_loaded.Append(name.GetData(), lib);

     }
     }

-
-    lib = new wxLibrary(handle);
-
-    wxClassInfo::sm_first = old_sm_first;
-
-    m_loaded.Append(name.GetData(), lib);
-
+    else
+       lib = NULL;

     return lib;
 }
 
     return lib;
 }