wxDialUpManager fixes

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index bd6cbe525016d3fb27c6efba51373282c39aa6ff..a3158210e28d26848bc82e2519b66061f59e8938 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -26,7 +26,6 @@
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif
 #ifdef __BORLANDC__
   #pragma hdrstop
 #endif

-

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


@@ -66,6 +65,14 @@
 #   endif  // Win32/16
 #   define wxDllGetSymbol(handle, name)    ::GetProcAddress(handle, name)
 #   define wxDllClose                      ::FreeLibrary
 #   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
 #   error "Don't know how to load shared libraries on this platform."
 #endif // OS


@@ -92,7 +99,7 @@ static wxString ConstructLibraryName(const wxString& basename)
 #   else       //__HPUX__
         fullname << ".so";
 #   endif      //__HPUX__
 #   else       //__HPUX__
         fullname << ".so";
 #   endif      //__HPUX__

-#elif defined(__WINDOWS__)
+#elif defined(__WINDOWS__) || defined(__OS2__)

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


@@ -176,50 +183,55 @@ void *wxLibrary::GetSymbol(const wxString& symbname)
 wxDllType
 wxDllLoader::GetProgramHandle(void)
 {
 wxDllType
 wxDllLoader::GetProgramHandle(void)
 {

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

-    wxFAIL_MSG(_("This method is not implemented under Windows"));
-
-    return 0;
-#endif   
+   wxFAIL_MSG(_("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(__OS2__)
+    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 )
+    {
+        wxLogSysError(_("Failed to load shared library '%s'"), libname.c_str());
+    }
+
+    if ( success )
+    {
+        *success = handle != 0;
+    }
+
+    return handle;

 }
 
 
 }
 
 


@@ -234,26 +246,28 @@ 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( __OS2__ )
+    wxDllGetSymbol(dllHandle, symbol);

 #else
     symbol = wxDllGetSymbol(dllHandle, name);
 #endif
 
     if ( !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;
 }
     }
     return symbol;
 }


@@ -262,7 +276,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 +298,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()


@@ -308,10 +327,10 @@ wxLibrary *wxLibraries::LoadLibrary(const wxString& name)
     {
         wxString fullname(tokenizer.NextToken());
 
     {
         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;


@@ -323,7 +342,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);