reverted rev 1.26, workarounds for memchecking code no longer needed

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 234406e8982fc03bba34907ccbff50b75cea4435..023ff4fe2a3308cd9e61c6ad6f4722c984d8fe37 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -17,7 +17,7 @@
 // headers
 // ----------------------------------------------------------------------------
 
 // headers
 // ----------------------------------------------------------------------------
 

-#ifdef __GNUG__
+#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA)

 #   pragma implementation "dynlib.h"
 #endif
 
 #   pragma implementation "dynlib.h"
 #endif
 


@@ -153,9 +153,13 @@ void *dlsym(void *handle, const char *symbol)
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");
 
 #if defined(__WINDOWS__) || defined(__WXPM__) || defined(__EMX__)
     const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll");

+#elif defined(__WXMAC__) && !defined(__DARWIN__)
+    const wxChar *wxDynamicLibrary::ms_dllext = _T("");

 #elif defined(__UNIX__)
     #if defined(__HPUX__)
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");
 #elif defined(__UNIX__)
     #if defined(__HPUX__)
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".sl");

+    #elif defined(__DARWIN__)
+        const wxChar *wxDynamicLibrary::ms_dllext = _T(".dylib");

     #else
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
     #endif
     #else
         const wxChar *wxDynamicLibrary::ms_dllext = _T(".so");
     #endif


@@ -222,7 +226,7 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
 
 #if defined(__VMS) || defined(__DARWIN__)
 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
 
 #if defined(__VMS) || defined(__DARWIN__)

-    m_handle = dlopen(libname.c_str(), 0);  // The second parameter is ignored
+    m_handle = dlopen(libname.fn_str(), 0);  // The second parameter is ignored

 #else // !__VMS  && !__DARWIN__
     int rtldFlags = 0;
 
 #else // !__VMS  && !__DARWIN__
     int rtldFlags = 0;
 


@@ -300,25 +304,22 @@ bool wxDynamicLibrary::Load(wxString libname, int flags)
     return IsLoaded();
 }
 
     return IsLoaded();
 }
 

-void wxDynamicLibrary::Unload()
+/* static */
+void wxDynamicLibrary::Unload(wxDllType handle)

 {
 {

-    if( IsLoaded() )
-    {

 #if defined(__WXPM__) || defined(__EMX__)
 #if defined(__WXPM__) || defined(__EMX__)

-        DosFreeModule( m_handle );
+    DosFreeModule( handle );

 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)
 #elif defined(HAVE_DLOPEN) || defined(__DARWIN__)

-        dlclose( m_handle );
+    dlclose( handle );

 #elif defined(HAVE_SHL_LOAD)
 #elif defined(HAVE_SHL_LOAD)

-        shl_unload( m_handle );
+    shl_unload( handle );

 #elif defined(__WINDOWS__)
 #elif defined(__WINDOWS__)

-        ::FreeLibrary( m_handle );
+    ::FreeLibrary( handle );

 #elif defined(__WXMAC__) && !defined(__DARWIN__)
 #elif defined(__WXMAC__) && !defined(__DARWIN__)

-        CloseConnection( (CFragConnectionID*) &m_handle );
+    CloseConnection( (CFragConnectionID*) &handle );

 #else
 #else

-#error  "runtime shared lib support not implemented"
+    #error  "runtime shared lib support not implemented"

 #endif
 #endif

-        m_handle = 0;
-    }

 }
 
 void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
 }
 
 void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const


@@ -329,17 +330,18 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     bool     failed = FALSE;
     void    *symbol = 0;
 
     bool     failed = FALSE;
     void    *symbol = 0;
 

+    wxUnusedVar(symbol);

 #if defined(__WXMAC__) && !defined(__DARWIN__)
     Ptr                 symAddress;
     CFragSymbolClass    symClass;
     Str255              symName;
 #if TARGET_CARBON
 #if defined(__WXMAC__) && !defined(__DARWIN__)
     Ptr                 symAddress;
     CFragSymbolClass    symClass;
     Str255              symName;
 #if TARGET_CARBON

-    c2pstrcpy( (StringPtr) symName, name );
+    c2pstrcpy( (StringPtr) symName, name.fn_str() );

 #else
 #else

-    strcpy( (char *)symName, name );
+    strcpy( (char *)symName, name.fn_str() );

     c2pstr( (char *)symName );
 #endif
     c2pstr( (char *)symName );
 #endif

-    if( FindSymbol( dllHandle, symName, &symAddress, &symClass ) == noErr )
+    if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )

         symbol = (void *)symAddress;
 
 #elif defined(__WXPM__) || defined(__EMX__)
         symbol = (void *)symAddress;
 
 #elif defined(__WXPM__) || defined(__EMX__)


@@ -356,7 +358,11 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
         symbol = 0;
 
 #elif defined(__WINDOWS__)
         symbol = 0;
 
 #elif defined(__WINDOWS__)

+#ifdef __WXWINCE__
+    symbol = (void*) ::GetProcAddress( m_handle, name );
+#else

     symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() );
     symbol = (void*) ::GetProcAddress( m_handle, name.mb_str() );

+#endif

 
 #else
 #error  "runtime shared lib support not implemented"
 
 #else
 #error  "runtime shared lib support not implemented"


@@ -391,17 +397,39 @@ void *wxDynamicLibrary::GetSymbol(const wxString &name, bool *success) const
     
 
 /*static*/
     
 
 /*static*/

-wxString wxDynamicLibrary::CanonicalizeName(const wxString& name,
-                                            wxDynamicLibraryCategory cat)
+wxString
+wxDynamicLibrary::CanonicalizeName(const wxString& name,
+                                   wxDynamicLibraryCategory
+#ifdef __UNIX__
+                                        cat
+#else // !__UNIX__
+                                        WXUNUSED(cat)
+#endif // __UNIX__/!__UNIX__
+                                   )

 {
 {

+    wxString nameCanonic;
+
+    // under Unix the library names usually start with "lib" prefix, add it

 #ifdef __UNIX__
 #ifdef __UNIX__

-    if ( cat == wxDL_MODULE )
-        return name + GetDllExt();
-    else
-        return wxString(_T("lib")) + name + GetDllExt();
-#else
-    return name + GetDllExt();
-#endif
+    switch ( cat )
+    {
+        default:
+            wxFAIL_MSG( _T("unknown wxDynamicLibraryCategory value") );
+            // fall through
+
+        case wxDL_MODULE:
+            // don't do anything for modules, their names are arbitrary
+            break;
+
+        case wxDL_LIBRARY:
+            // library names should start with "lib" under Unix
+            nameCanonic = _T("lib");
+            break;
+    }
+#endif // __UNIX__
+
+    nameCanonic << name << GetDllExt();
+    return nameCanonic;

 }
 
 /*static*/
 }
 
 /*static*/


@@ -427,22 +455,38 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name,
     if ( !suffix.empty() )
         suffix = wxString(_T("_")) + suffix;
 
     if ( !suffix.empty() )
         suffix = wxString(_T("_")) + suffix;
 

+#define WXSTRINGIZE(x)  #x

 #ifdef __UNIX__
     #if (wxMINOR_VERSION % 2) == 0
 #ifdef __UNIX__
     #if (wxMINOR_VERSION % 2) == 0

-        #define wxDLLVER(x,y,z) "-" #x "." #y
+        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y)

     #else
     #else

-        #define wxDLLVER(x,y,z) "-" #x "." #y "." #z
+        #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) "." WXSTRINGIZE(z)

     #endif
 #else
     #if (wxMINOR_VERSION % 2) == 0
     #endif
 #else
     #if (wxMINOR_VERSION % 2) == 0

-        #define wxDLLVER(x,y,z) #x #y
+        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y)

     #else
     #else

-        #define wxDLLVER(x,y,z) #x #y #z
+        #define wxDLLVER(x,y,z) WXSTRINGIZE(x) WXSTRINGIZE(y) WXSTRINGIZE(z)

     #endif
 #endif
     #endif
 #endif

+

     suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
                                            wxRELEASE_NUMBER));
 #undef wxDLLVER
     suffix << wxString::FromAscii(wxDLLVER(wxMAJOR_VERSION, wxMINOR_VERSION,
                                            wxRELEASE_NUMBER));
 #undef wxDLLVER

+#undef WXSTRINGIZE
+
+#ifdef __WINDOWS__
+    // Add compiler identification:
+    #if defined(__GNUG__)
+        suffix << _T("_gcc");
+    #elif defined(__VISUALC__)
+        suffix << _T("_vc");
+    #elif defined(__WATCOMC__)
+        suffix << _T("_wat");
+    #elif defined(__BORLANDC__)
+        suffix << _T("_bcc");
+    #endif
+#endif

 
     return CanonicalizeName(name + suffix, wxDL_MODULE);
 }
 
     return CanonicalizeName(name + suffix, wxDL_MODULE);
 }


@@ -452,14 +496,21 @@ wxString wxDynamicLibrary::GetPluginsDirectory()
 {
 #ifdef __UNIX__
     wxString format = wxGetInstallPrefix();
 {
 #ifdef __UNIX__
     wxString format = wxGetInstallPrefix();

+    wxString dir;

     format << wxFILE_SEP_PATH
            << wxT("lib") << wxFILE_SEP_PATH
            << wxT("wx") << wxFILE_SEP_PATH
     format << wxFILE_SEP_PATH
            << wxT("lib") << wxFILE_SEP_PATH
            << wxT("wx") << wxFILE_SEP_PATH

+#if (wxMINOR_VERSION % 2) == 0

            << wxT("%i.%i");
            << wxT("%i.%i");

-    wxString dir;

     dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);
     dir.Printf(format.c_str(), wxMAJOR_VERSION, wxMINOR_VERSION);

-    return dir;

 #else
 #else

+           << wxT("%i.%i.%i");
+    dir.Printf(format.c_str(),
+               wxMAJOR_VERSION, wxMINOR_VERSION, wxRELEASE_NUMBER);
+#endif
+    return dir;
+
+#else // ! __UNIX__

     return wxEmptyString;
 #endif
 }
     return wxEmptyString;
 #endif
 }