Various fixes for wxFilename.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index bd6cbe525016d3fb27c6efba51373282c39aa6ff..3aa8cc8758618e03840a2f0bb3b766f6ca2986a1 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -29,6 +29,10 @@
 
 #if wxUSE_DYNLIB_CLASS
 
 
 #if wxUSE_DYNLIB_CLASS
 

+#if defined(__WINDOWS__)
+    #include "wx/msw/private.h"
+#endif
+

 #include "wx/dynlib.h"
 #include "wx/filefn.h"
 #include "wx/intl.h"
 #include "wx/dynlib.h"
 #include "wx/filefn.h"
 #include "wx/intl.h"


@@ -39,9 +43,15 @@
 // conditional compilation
 // ----------------------------------------------------------------------------
 
 // conditional compilation
 // ----------------------------------------------------------------------------
 

-#if defined(HAVE_DLOPEN)
+#if defined(__WXPM__) || defined(__EMX__)
+#  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)
+#elif defined(HAVE_DLOPEN)

 #   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)
 #   define wxDllOpen(lib)                dlopen(lib.fn_str(), RTLD_NOW/*RTLD_LAZY*/)

-#   define wxDllGetSymbol(handle, name)  dlsym(handle, name.mb_str())
+#   define wxDllGetSymbol(handle, name)  dlsym(handle, name)

 #   define wxDllClose                    dlclose
 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)
 #   define wxDllClose                    dlclose
 #elif defined(HAVE_SHL_LOAD)
 #   define wxDllOpen(lib)                shl_load(lib.fn_str(), BIND_DEFERRED, 0)


@@ -56,11 +66,13 @@
             return (void *)0;
     }
 #elif defined(__WINDOWS__)
             return (void *)0;
     }
 #elif defined(__WINDOWS__)

-#   include <windows.h>
-

     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__
     // using LoadLibraryEx under Win32 to avoid name clash with LoadLibrary
 #   ifdef __WIN32__

-#      define wxDllOpen(lib)                  ::LoadLibraryEx(lib, 0, 0)
+#ifdef _UNICODE
+#      define wxDllOpen(lib)                  ::LoadLibraryExW(lib, 0, 0)
+#else
+#      define wxDllOpen(lib)                  ::LoadLibraryExA(lib, 0, 0)
+#endif

 #   else   // Win16
 #      define wxDllOpen(lib)                  ::LoadLibrary(lib)
 #   endif  // Win32/16
 #   else   // Win16
 #      define wxDllOpen(lib)                  ::LoadLibrary(lib)
 #   endif  // Win32/16


@@ -76,34 +88,20 @@
 
 wxLibraries wxTheLibraries;
 
 
 wxLibraries wxTheLibraries;
 

-// ----------------------------------------------------------------------------
-// private functions
-// ----------------------------------------------------------------------------
+// ============================================================================
+// 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)
 {
 
 // 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(basename);
-
-#if defined(__UNIX__)
-#   if defined(__HPUX__)
-        fullname << ".sl";
-#   else       //__HPUX__
-        fullname << ".so";
-#   endif      //__HPUX__
-#elif defined(__WINDOWS__)
-    fullname << ".dll";
-#endif
+    wxString fullname;
+    fullname << basename << wxDllLoader::GetDllExt();

 
     return fullname;
 }
 
 
     return fullname;
 }
 

-// ============================================================================
-// implementation
-// ============================================================================
-
-

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


@@ -172,54 +170,103 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 // wxDllLoader
 // ---------------------------------------------------------------------------
 
 // wxDllLoader
 // ---------------------------------------------------------------------------
 

+/* static */
+wxString wxDllLoader::GetDllExt()
+{
+    wxString ext;
+
+#if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
+    ext = _T(".dll");
+#elif defined(__UNIX__)
+#   if defined(__HPUX__)
+        ext = _T(".sl");
+#   else //__HPUX__
+        ext = _T(".so");
+#   endif //__HPUX__
+#endif
+
+    return ext;
+}
+

 /* static */
 wxDllType
 wxDllLoader::GetProgramHandle(void)
 {
 /* static */
 wxDllType
 wxDllLoader::GetProgramHandle(void)
 {

-#ifdef __UNIX__
-    return dlopen(NULL, RTLD_NOW/*RTLD_LAZY*/);
+#if defined( HAVE_DLOPEN ) && !defined(__EMX__)
+   // 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
 #else

-    wxFAIL_MSG(_("This method is not implemented under Windows"));
-
-    return 0;
-#endif   
+   wxFAIL_MSG( wxT("This method is not implemented under Windows or OS/2"));
+   return 0;
+#endif

 }
 
 }
 

-

 /* static */
 wxDllType
 /* static */
 wxDllType

-wxDllLoader::LoadLibrary(const wxString & lib_name, bool *success)
+wxDllLoader::LoadLibrary(const wxString & libname, bool *success)

 {
 {

-   wxASSERT(success);
-   
-   wxDllType handle;
+    wxDllType handle;

 
 #if defined(__WXMAC__)
 
 #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(__WXPM__) || defined(__EMX__)
+    char zError[256] = "";
+    wxDllOpen(zError, libname, handle);

 #else // !Mac
 #else // !Mac

-   handle = wxDllOpen(lib_name);
+    handle = wxDllOpen(libname);

 #endif // OS
 
 #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 )
+    {
+        wxString msg(_("Failed to load shared library '%s'"));
+
+#ifdef HAVE_DLERROR
+        const char *errmsg = dlerror();
+        if ( errmsg )
+        {
+            // the error string format is "libname: ...", but we already have
+            // libname, so cut it off
+            const char *p = strchr(errmsg, ':');
+            if ( p )
+            {
+                if ( *++p == ' ' )
+                    p++;
+            }
+            else
+            {
+                p = errmsg;
+            }
+
+            msg += _T(" (%s)");
+            wxLogError(msg, libname.c_str(), p);
+        }
+        else
+#endif // HAVE_DLERROR
+        {
+            wxLogSysError(msg, libname.c_str());
+        }
+    }
+
+    if ( success )
+    {
+        *success = handle != 0;
+    }
+
+    return handle;

 }
 
 
 }
 
 


@@ -234,26 +281,29 @@ wxDllLoader::UnloadLibrary(wxDllType handle)
 void *
 wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 {
 void *
 wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 {

-   void *symbol = NULL;    // return value
+    void *symbol = NULL;    // return value

 
 #if defined( __WXMAC__ )
 
 #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( __WXPM__ ) || defined(__EMX__)
+    wxDllGetSymbol(dllHandle, symbol);

 #else
 #else

-    symbol = wxDllGetSymbol(dllHandle, name);
+    // mb_str() is necessary in Unicode build
+    symbol = wxDllGetSymbol(dllHandle, name.mb_str());

 #endif
 
     if ( !symbol )
     {
 #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;
 }
     }
     return symbol;
 }


@@ -262,7 +312,7 @@ wxDllLoader::GetSymbol(wxDllType dllHandle, const wxString &name)
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 
 // wxLibraries (only one instance should normally exist)
 // ---------------------------------------------------------------------------
 

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

 {
 }
 
 {
 }
 


@@ -284,14 +334,19 @@ 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()
 
 /*
   Unix automatically builds that library name, at least for dlopen()


@@ -302,16 +357,16 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )
     wxString libPath("/lib:/usr/lib"); // system path first
     const char *envLibPath = getenv("LD_LIBRARY_PATH");
     if ( envLibPath )

-        libPath << ':' << envLibPath;
-    wxStringTokenizer tokenizer(libPath, _T(':'));
+        libPath << wxT(':') << envLibPath;
+    wxStringTokenizer tokenizer(libPath, wxT(':'));

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

-        fullname << '/' << lib_name;
+        fullname << wxT('/') << libname;

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

-            lib_name = fullname;
+            libname = fullname;

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


@@ -323,7 +378,7 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
 #endif
 
     bool success = FALSE;
 #endif
 
     bool success = FALSE;

-    wxDllType handle = wxDllLoader::LoadLibrary(lib_name, &success);
+    wxDllType handle = wxDllLoader::LoadLibrary(libname, &success);

     if(success)
     {
        lib = new wxLibrary(handle);
     if(success)
     {
        lib = new wxLibrary(handle);