* wxDataStreams use wxUint now.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 447fb80a87e7026eded1bc30861bd8ae218a354f..0a161789d88aa40b6cd5936d4357f604a585c641 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -18,14 +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
 
 
 #if wxUSE_DYNLIB_CLASS
 


@@ -40,27 +40,34 @@
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)
 // ----------------------------------------------------------------------------
 
 #if defined(HAVE_DLOPEN)

-    #define wxDllOpen(lib)                dlopen(lib, RTLD_LAZY)
-    #define wxDllGetSymbol(handle, name)  dlsym(handle, (char *)name)
-    #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, 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 char *name)
+    static inline void *wxDllGetSymbol(shl_t handle, const wxString& name)

     {
         void *sym;
     {
         void *sym;

-        if ( shl_findsym(&handle, name, TYPE_UNDEFINED, &sym) == 0 )
+        if ( shl_findsym(&handle, name.mb_str(), TYPE_UNDEFINED, &sym) == 0 )

             return sym;
         else
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return sym;
         else
             return (void *)0;
     }
 #elif defined(__WINDOWS__)

-    #define wxDllOpen(lib)                  ::LoadLibrary(lib)
-    #define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
-    #define wxDllClose                      ::FreeLibrary
+#   include <windows.h>
+
+    // 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

 #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
 
 // ---------------------------------------------------------------------------


@@ -80,11 +87,11 @@ 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__
+#   endif      //__HPUX__

 #elif defined(__WINDOWS__)
     fullname << ".dll";
 #endif
 #elif defined(__WINDOWS__)
     fullname << ".dll";
 #endif


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

+

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


@@ -157,32 +165,87 @@ void wxLibrary::PrepareClasses(wxClassInfo *first)
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 {
 
 void *wxLibrary::GetSymbol(const wxString& symbname)
 {

-    void *symbol = NULL;    // return value
+   return wxDllLoader::GetSymbol(m_handle, symbname);
+}

 
 

-#if defined( __WXMAC__ )
-    Ptr symAddress ;
-    CFragSymbolClass symClass ;
-    Str255     symName ;
+// ---------------------------------------------------------------------------
+// wxDllLoader
+// ---------------------------------------------------------------------------

 
 

-    strcpy( (char*) symName , symbname ) ;
-    c2pstr( (char*) symName ) ;
+/* static */
+wxDllType
+wxDllLoader::GetProgramHandle(void)
+{
+#ifdef __WXGTK__
+   return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
+#else
+#pragma warning "Not implemented, please fix!"
+   return 0;
+#endif   
+}

 
 

-    if ( FindSymbol( m_handle , symName , &symAddress , &symClass ) == noErr )
-    {
-        symbol = (void *)symAddress ; 
-    }
+
+/* static */
+wxDllType
+wxDllLoader::LoadLibrary(const wxString & lib_name, bool *success)
+{
+   wxASSERT(success);
+   
+   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 )
+   {
+      wxLogSysError(_("Failed to load shared library '%s'"),
+                    lib_name.c_str());
+      *success = FALSE;
+      return NULL;
+   }
+   *success = TRUE;
+   return handle;
+}
+
+/* static */
+void *
+wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
+{
+   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 ; 

 #else
 #else

-    // VZ: hmm... why is WXSTRINGCAST needed? if it's really modified, we
-    //     should make a copy of it
-    symbol = wxDllGetSymbol(m_handle, WXSTRINGCAST symbname);
+    symbol = wxDllGetSymbol(dllHandle, name);

 #endif
 
     if ( !symbol )
     {
 #endif
 
     if ( !symbol )
     {

-        wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
-                      symbname.c_str());
+       wxLogSysError(_("Couldn't find symbol '%s' in a dynamic library"),
+                     name.c_str());

     }
     }

-

     return symbol;
 }
 
     return symbol;
 }
 


@@ -221,13 +284,17 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 
     wxString lib_name = ConstructLibraryName(name);
 
 
     wxString lib_name = 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, ':');
+    wxStringTokenizer tokenizer(libPath, _T(':'));

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


@@ -244,40 +311,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(lib_name, &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;
 }