X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/60431236a330a9f3f1d071719e818812820b4d0c..69659fd770f615210efac4b4fa741b3ad6223616:/src/msw/dlmsw.cpp diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp index cd0d38ae2c..18a819d796 100644 --- a/src/msw/dlmsw.cpp +++ b/src/msw/dlmsw.cpp @@ -28,7 +28,7 @@ #include "wx/msw/private.h" #include "wx/msw/debughlp.h" -const wxChar *wxDynamicLibrary::ms_dllext = _T(".dll"); +const wxString wxDynamicLibrary::ms_dllext(_T(".dll")); // ---------------------------------------------------------------------------- // private classes @@ -79,8 +79,25 @@ public: wxVersionDLL *verDLL; }; + // the declared type of the first EnumModulesProc() parameter changed in + // recent SDK versions and is no PCSTR instead of old PSTR, we know that + // it's const in version 11 and non-const in version 8 included with VC8 + // (and earlier), suppose that it's only changed in version 11 + #if defined(API_VERSION_NUMBER) && API_VERSION_NUMBER >= 11 + typedef PCSTR NameStr_t; + #else + typedef PSTR NameStr_t; + #endif + + // TODO: fix EnumerateLoadedModules() to use EnumerateLoadedModules64() + #ifdef __WIN64__ + typedef DWORD64 DWORD_32_64; + #else + typedef DWORD DWORD_32_64; + #endif + static BOOL CALLBACK - EnumModulesProc(PSTR name, DWORD base, ULONG size, void *data); + EnumModulesProc(NameStr_t name, DWORD_32_64 base, ULONG size, void *data); }; // ---------------------------------------------------------------------------- @@ -121,8 +138,14 @@ HMODULE wxGetModuleHandle(const char *name, void *addr) return hmod; } - // if failed, try by name - return ::GetModuleHandleA(name); + // Windows CE only has Unicode API, so even we have an ANSI string here, we + // still need to use GetModuleHandleW() there and so do it everywhere to + // avoid #ifdefs -- this code is not performance-critical anyhow... +#ifdef __WINCE__ + return ::GetModuleHandleW(wxConvLibc.cMB2WC(name).data()); +#else + return ::GetModuleHandleA((char *)name); +#endif } // ============================================================================ @@ -172,7 +195,7 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const wxString ver; if ( m_dll.IsLoaded() ) { - wxChar *pc = wx_const_cast(wxChar *, filename.c_str()); + wxChar *pc = wx_const_cast(wxChar *, filename.wx_str()); DWORD dummy; DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy); @@ -206,8 +229,8 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const /* static */ BOOL CALLBACK -wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, - DWORD base, +wxDynamicLibraryDetailsCreator::EnumModulesProc(NameStr_t name, + DWORD_32_64 base, ULONG size, void *data) { @@ -242,6 +265,15 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, // wxDynamicLibrary implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// misc functions +// ---------------------------------------------------------------------------- + +wxDllType wxDynamicLibrary::GetProgramHandle() +{ + return (wxDllType)::GetModuleHandle(NULL); +} + // ---------------------------------------------------------------------------- // loading/unloading DLLs // ---------------------------------------------------------------------------- @@ -250,7 +282,7 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, wxDllType wxDynamicLibrary::RawLoad(const wxString& libname, int WXUNUSED(flags)) { - return ::LoadLibrary(libname); + return ::LoadLibrary(libname.wx_str()); } /* static */ @@ -262,7 +294,13 @@ void wxDynamicLibrary::Unload(wxDllType handle) /* static */ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name) { - return (void *)::GetProcAddress(handle, name.ToAscii()); + return (void *)::GetProcAddress(handle, +#ifdef __WXWINCE__ + name.c_str() +#else + name.ToAscii() +#endif // __WXWINCE__ + ); } // ----------------------------------------------------------------------------