X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/da55d0644f1cc11b5c55de4fc18d039f69666e86..77c8efc8c37da6d6a5e2e8022d21d1cd7d76371d:/src/common/dynlib.cpp diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp index bf227bbf0e..0ebec2bd9c 100644 --- a/src/common/dynlib.cpp +++ b/src/common/dynlib.cpp @@ -1,5 +1,5 @@ ///////////////////////////////////////////////////////////////////////////// -// Name: dynlib.cpp +// Name: src/common/dynlib.cpp // Purpose: Dynamic library management // Author: Guilhem Lavaux // Modified by: @@ -21,34 +21,30 @@ // headers // ---------------------------------------------------------------------------- -#if defined(__GNUG__) && !defined(NO_GCC_PRAGMA) -# pragma implementation "dynlib.h" -#endif - #include "wx/wxprec.h" #ifdef __BORLANDC__ - #pragma hdrstop + #pragma hdrstop #endif #if wxUSE_DYNLIB_CLASS #include "wx/dynlib.h" + +#ifndef WX_PRECOMP + #include "wx/intl.h" + #include "wx/log.h" + #include "wx/app.h" + #include "wx/utils.h" +#endif //WX_PRECOMP + #include "wx/filefn.h" -#include "wx/intl.h" -#include "wx/log.h" -#include "wx/utils.h" #include "wx/filename.h" // for SplitPath() -#include "wx/app.h" -#include "wx/apptrait.h" +#include "wx/platinfo.h" #include "wx/arrimpl.cpp" -#if defined(__WXMAC__) - #include "wx/mac/private.h" -#endif - -WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray); +WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray) // ============================================================================ // implementation @@ -59,13 +55,11 @@ WX_DEFINE_USER_EXPORTED_OBJARRAY(wxDynamicLibraryDetailsArray); // --------------------------------------------------------------------------- #if defined(__WXPM__) || defined(__EMX__) - const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll"); -#elif defined(__WXMAC__) && !defined(__DARWIN__) - const wxChar *wxDynamicLibrary::ms_dllext = _T(""); + const wxString wxDynamicLibrary::ms_dllext(wxT(".dll")); #endif -// for Unix it is in src/unix/dlunix.cpp -#ifndef __UNIX__ +// for MSW/Unix it is defined in platform-specific file +#if !(defined(__WINDOWS__) || defined(__UNIX__)) || defined(__EMX__) wxDllType wxDynamicLibrary::GetProgramHandle() { @@ -73,11 +67,12 @@ wxDllType wxDynamicLibrary::GetProgramHandle() return 0; } -#endif // __UNIX__ +#endif // __WINDOWS__ || __UNIX__ + bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) { - wxASSERT_MSG(m_handle == 0, _T("Library already loaded.")); + wxASSERT_MSG(m_handle == 0, wxT("Library already loaded.")); // add the proper extension for the DLL ourselves unless told not to wxString libname = libnameOrig; @@ -95,36 +90,14 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) // different ways to load a shared library // // FIXME: should go to the platform-specific files! -#if defined(__WXMAC__) && !defined(__DARWIN__) - FSSpec myFSSpec; - Ptr myMainAddr; - Str255 myErrName; - - wxMacFilename2FSSpec( libname , &myFSSpec ); - - if( GetDiskFragment( &myFSSpec, - 0, - kCFragGoesToEOF, - "\p", - kPrivateCFragCopy, - &m_handle, - &myMainAddr, - myErrName ) != noErr ) - { - wxLogSysError( _("Failed to load shared library '%s' Error '%s'"), - libname.c_str(), - wxMacMakeStringFromPascal( myErrName ).c_str() ); - m_handle = 0; - } - -#elif defined(__WXPM__) || defined(__EMX__) - char err[256] = ""; +#if defined(__WXPM__) || defined(__EMX__) + char err[256] = ""; DosLoadModule(err, sizeof(err), libname.c_str(), &m_handle); -#else +#else // this should be the only remaining branch eventually m_handle = RawLoad(libname, flags); #endif - if ( m_handle == 0 ) + if ( m_handle == 0 && !(flags & wxDL_QUIET) ) { #ifdef wxHAVE_DYNLIB_ERROR Error(); @@ -139,43 +112,29 @@ bool wxDynamicLibrary::Load(const wxString& libnameOrig, int flags) // for MSW and Unix this is implemented in the platform-specific file // // TODO: move the rest to os2/dlpm.cpp and mac/dlmac.cpp! -#if !defined(__WXMSW__) && !defined(__UNIX__) +#if (!defined(__WINDOWS__) && !defined(__UNIX__)) || defined(__EMX__) /* static */ void wxDynamicLibrary::Unload(wxDllType handle) { -#if defined(__WXPM__) || defined(__EMX__) +#if defined(__OS2__) || defined(__EMX__) DosFreeModule( handle ); -#elif defined(__WXMAC__) && !defined(__DARWIN__) - CloseConnection( (CFragConnectionID*) &handle ); #else #error "runtime shared lib support not implemented" #endif } -#endif // !(__WXMSW__ || __UNIX__) +#endif // !(__WINDOWS__ || __UNIX__) void *wxDynamicLibrary::DoGetSymbol(const wxString &name, bool *success) const { wxCHECK_MSG( IsLoaded(), NULL, - _T("Can't load symbol from unloaded library") ); + wxT("Can't load symbol from unloaded library") ); void *symbol = 0; wxUnusedVar(symbol); -#if defined(__WXMAC__) && !defined(__DARWIN__) - Ptr symAddress; - CFragSymbolClass symClass; - Str255 symName; -#if TARGET_CARBON - c2pstrcpy( (StringPtr) symName, name.fn_str() ); -#else - strcpy( (char *)symName, name.fn_str() ); - c2pstr( (char *)symName ); -#endif - if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr ) - symbol = (void *)symAddress; -#elif defined(__WXPM__) || defined(__EMX__) +#if defined(__WXPM__) || defined(__EMX__) DosQueryProcAddr( m_handle, 1L, name.c_str(), (PFN*)symbol ); #else symbol = RawGetSymbol(m_handle, name); @@ -215,11 +174,11 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name, wxString nameCanonic; // under Unix the library names usually start with "lib" prefix, add it -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__EMX__) switch ( cat ) { default: - wxFAIL_MSG( _T("unknown wxDynamicLibraryCategory value") ); + wxFAIL_MSG( wxT("unknown wxDynamicLibraryCategory value") ); // fall through case wxDL_MODULE: @@ -228,7 +187,7 @@ wxDynamicLibrary::CanonicalizeName(const wxString& name, case wxDL_LIBRARY: // library names should start with "lib" under Unix - nameCanonic = _T("lib"); + nameCanonic = wxT("lib"); break; } #else // !__UNIX__ @@ -246,24 +205,20 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name, wxString suffix; if ( cat == wxDL_PLUGIN_GUI ) { - wxAppTraits *traits = wxAppConsole::GetInstance() ? - wxAppConsole::GetInstance()->GetTraits() : NULL; - wxASSERT_MSG( traits, - _("can't query for GUI plugins name in console applications") ); - suffix = traits->GetToolkitInfo().shortName; + suffix = wxPlatformInfo::Get().GetPortIdShortName(); } #if wxUSE_UNICODE - suffix << _T('u'); + suffix << wxT('u'); #endif #ifdef __WXDEBUG__ - suffix << _T('d'); + suffix << wxT('d'); #endif if ( !suffix.empty() ) - suffix = wxString(_T("_")) + suffix; + suffix = wxString(wxT("_")) + suffix; #define WXSTRINGIZE(x) #x -#ifdef __UNIX__ +#if defined(__UNIX__) && !defined(__EMX__) #if (wxMINOR_VERSION % 2) == 0 #define wxDLLVER(x,y,z) "-" WXSTRINGIZE(x) "." WXSTRINGIZE(y) #else @@ -285,13 +240,13 @@ wxString wxDynamicLibrary::CanonicalizePluginName(const wxString& name, #ifdef __WINDOWS__ // Add compiler identification: #if defined(__GNUG__) - suffix << _T("_gcc"); + suffix << wxT("_gcc"); #elif defined(__VISUALC__) - suffix << _T("_vc"); + suffix << wxT("_vc"); #elif defined(__WATCOMC__) - suffix << _T("_wat"); + suffix << wxT("_wat"); #elif defined(__BORLANDC__) - suffix << _T("_bcc"); + suffix << wxT("_bcc"); #endif #endif