// Created: 20/07/98
// RCS-ID: $Id$
// Copyright: (c) Guilhem Lavaux
-// Licence: wxWindows license
+// Licence: wxWindows licence
/////////////////////////////////////////////////////////////////////////////
// ============================================================================
#pragma hdrstop
#endif
-#if wxUSE_DYNLIB_CLASS
+#if wxUSE_DYNLIB_CLASS && !wxUSE_DYNAMIC_LOADER
#if defined(__WINDOWS__)
#include "wx/msw/private.h"
#include "wx/intl.h"
#include "wx/log.h"
+#if defined(__WXMAC__)
+ #include "wx/mac/private.h"
+#endif
+
// ----------------------------------------------------------------------------
// conditional compilation
// ----------------------------------------------------------------------------
# define wxDllGetSymbol(handle, name) ::GetProcAddress(handle, name)
# define wxDllClose ::FreeLibrary
#elif defined(__WXMAC__)
-# define wxDllClose(handle) CloseConnection(&handle)
+# define wxDllClose(handle) CloseConnection(&((CFragConnectionID)handle))
#else
# error "Don't know how to load shared libraries on this platform."
#endif // OS
m_handle = handle;
// Some system may use a local heap for library.
- get_first = (t_get_first)GetSymbol("wxGetClassFirst");
+ get_first = (t_get_first)GetSymbol(_T("wxGetClassFirst"));
// It is a wxWindows DLL.
if (get_first)
PrepareClasses(get_first());
#else
const wxString wxDllLoader::ms_dllext( _T(".so") );
#endif
+#elif defined(__WXMAC__)
+const wxString wxDllLoader::ms_dllext( _T("") );
#endif
/* static */
kCFragGoesToEOF,
"\p",
kPrivateCFragCopy,
- &handle,
+ &((CFragConnectionID)handle),
&myMainAddr,
myErrName ) != noErr )
{
CFragSymbolClass symClass;
Str255 symName;
-#if TARGET_CARBON
- c2pstrcpy( (StringPtr) symName, name );
-#else
- strcpy( (char *) symName, name );
- c2pstr( (char *) symName );
-#endif
- if( FindSymbol( dllHandle, symName, &symAddress, &symClass ) == noErr )
+ wxMacStringToPascal( name.c_str() , symName ) ;
+
+ if( FindSymbol( ((CFragConnectionID)dllHandle), symName, &symAddress, &symClass ) == noErr )
symbol = (void *)symAddress;
#elif defined(__WXPM__) || defined(__EMX__)
wxDllGetSymbol(dllHandle, symbol);
-#else
+#else // Windows or Unix
+
// mb_str() is necessary in Unicode build
- symbol = wxDllGetSymbol(dllHandle, name.mb_str());
+ //
+ // "void *" cast is needed by gcc 3.1 + w32api 1.4, don't ask me why
+ symbol = (void *)wxDllGetSymbol(dllHandle, name.mb_str());
-#endif
+#endif // OS
if ( !symbol )
{
- wxString msg(_("wxDllLoader failed to GetSymbol '%s'"));
-
#ifdef HAVE_DLERROR
const wxChar *err = dlerror();
if( err )
{
- failed = TRUE;
- wxLogError( msg, err );
+ wxLogError(wxT("%s"), err);
}
#else
failed = TRUE;
return NULL;
}
-#ifdef __DARWIN__
+#endif // wxUSE_DYNLIB_CLASS && !wxUSE_DYNAMIC_LOADER
+
+#if defined(__DARWIN__) && (wxUSE_DYNLIB_CLASS || wxUSE_DYNAMIC_LOADER)
// ---------------------------------------------------------------------------
// For Darwin/Mac OS X
// supply the sun style dlopen functions in terms of Darwin NS*
// ---------------------------------------------------------------------------
-extern "C" {
-#import <mach-o/dyld.h>
-};
-
-enum dyldErrorSource
-{
- OFImage,
-};
+#include <stdio.h>
+#include <mach-o/dyld.h>
static char dl_last_error[1024];
static
-void TranslateError(const char *path, enum dyldErrorSource type, int number)
+void TranslateError(const char *path, int number)
{
unsigned int index;
static char *OFIErrorStrings[] =
};
#define NUM_OFI_ERRORS (sizeof(OFIErrorStrings) / sizeof(OFIErrorStrings[0]))
- switch (type)
- {
- case OFImage:
- index = number;
- if (index > NUM_OFI_ERRORS - 1) {
- index = NUM_OFI_ERRORS - 1;
- }
- sprintf(dl_last_error, OFIErrorStrings[index], path, number);
- break;
-
- default:
- sprintf(dl_last_error, "%s(%d): Totally unknown error type %d\n",
- path, number, type);
- break;
+ index = number;
+ if (index > NUM_OFI_ERRORS - 1) {
+ index = NUM_OFI_ERRORS - 1;
}
+ sprintf(dl_last_error, OFIErrorStrings[index], path, number);
}
const char *dlerror()
return dl_last_error;
}
-void *dlopen(const char *path, int mode /* mode is ignored */)
+void *dlopen(const char *path, int WXUNUSED(mode) /* mode is ignored */)
{
int dyld_result;
NSObjectFileImage ofile;
dyld_result = NSCreateObjectFileImageFromFile(path, &ofile);
if (dyld_result != NSObjectFileImageSuccess)
{
- TranslateError(path, OFImage, dyld_result);
+ TranslateError(path, dyld_result);
}
else
{
// NSLinkModule will cause the run to abort on any link error's
// not very friendly but the error recovery functionality is limited.
- handle = NSLinkModule(ofile, path, TRUE);
+ handle = NSLinkModule(ofile, path, NSLINKMODULE_OPTION_BINDNOW);
}
return handle;
}
-int dlclose(void *handle) /* stub only */
+int dlclose(void *handle)
{
+ NSUnLinkModule( handle, NSUNLINKMODULE_OPTION_NONE);
return 0;
}
void *dlsym(void *handle, const char *symbol)
{
void *addr;
+
+ NSSymbol nsSymbol = NSLookupSymbolInModule( handle , symbol ) ;
- if (NSIsSymbolNameDefined(symbol)) {
- addr = NSAddressOfSymbol(NSLookupAndBindSymbol(symbol));
+ if ( nsSymbol)
+ {
+ addr = NSAddressOfSymbol(nsSymbol);
}
- else {
- addr = NULL;
+ else
+ {
+ addr = NULL;
}
return addr;
}
-#endif // __DARWIN__
-
-#endif // wxUSE_DYNLIB_CLASS
+#endif // defined(__DARWIN__) && (wxUSE_DYNLIB_CLASS || wxUSE_DYNAMIC_LOADER)