Fixed possible usage of uninitialized variable.

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

diff --git a/src/common/dynlib.cpp b/src/common/dynlib.cpp
index 185e81661f281dda4d88f78c8e2d420683a5de8a..167249ab207f4ad84ca714a5590bce1736f3b068 100644 (file)
--- a/src/common/dynlib.cpp
+++ b/src/common/dynlib.cpp
@@ -222,7 +222,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;
 


@@ -326,14 +326,15 @@ 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
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )
     c2pstr( (char *)symName );
 #endif
     if( FindSymbol( m_handle, symName, &symAddress, &symClass ) == noErr )


@@ -353,7 +354,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"