X-Git-Url: https://git.saurik.com/wxWidgets.git/blobdiff_plain/defbed48e78f4e84b35f62c2c1b7fd58d740501c..1aff4201c36daec702cabc869c0bf899c56ba8cc:/src/msw/dlmsw.cpp diff --git a/src/msw/dlmsw.cpp b/src/msw/dlmsw.cpp index f0f1076135..e3bde950a5 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(wxT(".dll")); // ---------------------------------------------------------------------------- // private classes @@ -65,7 +65,7 @@ private: wxDynamicLibrary m_dll; - DECLARE_NO_COPY_CLASS(wxVersionDLL) + wxDECLARE_NO_COPY_CLASS(wxVersionDLL); }; // class used to create wxDynamicLibraryDetails objects @@ -79,52 +79,27 @@ 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); }; -// ---------------------------------------------------------------------------- -// private functions -// ---------------------------------------------------------------------------- - -// return the module handle for the given base name -static -HMODULE wxGetModuleHandle(const char *name, void *addr) -{ - // we want to use GetModuleHandleEx() instead of usual GetModuleHandle() - // because the former works correctly for comctl32.dll while the latter - // returns NULL when comctl32.dll version 6 is used under XP (note that - // GetModuleHandleEx() is only available under XP and later, coincidence?) - - // check if we can use GetModuleHandleEx - typedef BOOL (WINAPI *GetModuleHandleEx_t)(DWORD, LPCTSTR, HMODULE *); - - static const GetModuleHandleEx_t INVALID_FUNC_PTR = (GetModuleHandleEx_t)-1; - - static GetModuleHandleEx_t s_pfnGetModuleHandleEx = INVALID_FUNC_PTR; - if ( s_pfnGetModuleHandleEx == INVALID_FUNC_PTR ) - { - wxDynamicLibrary dll(_T("kernel32.dll"), wxDL_VERBATIM); - s_pfnGetModuleHandleEx = - (GetModuleHandleEx_t)dll.RawGetSymbol(_T("GetModuleHandleExA")); - - // dll object can be destroyed, kernel32.dll won't be unloaded anyhow - } - - // get module handle from its address - if ( s_pfnGetModuleHandleEx ) - { - // flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | - // GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS - HMODULE hmod; - if ( s_pfnGetModuleHandleEx(6, (char *)addr, &hmod) && hmod ) - return hmod; - } - - // if failed, try by name - return ::GetModuleHandleA(name); -} - // ============================================================================ // wxVersionDLL implementation // ============================================================================ @@ -139,7 +114,7 @@ wxVersionDLL::wxVersionDLL() // handle it wxLogNull noLog; - if ( m_dll.Load(_T("version.dll"), wxDL_VERBATIM) ) + if ( m_dll.Load(wxT("version.dll"), wxDL_VERBATIM) ) { // the functions we load have either 'A' or 'W' suffix depending on // whether we're in ANSI or Unicode build @@ -150,7 +125,7 @@ wxVersionDLL::wxVersionDLL() #endif // UNICODE/ANSI #define LOAD_VER_FUNCTION(name) \ - m_pfn ## name = (name ## _t)m_dll.GetSymbol(_T(#name SUFFIX)); \ + m_pfn ## name = (name ## _t)m_dll.GetSymbol(wxT(#name SUFFIX)); \ if ( !m_pfn ## name ) \ { \ m_dll.Unload(); \ @@ -172,7 +147,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 = const_cast((const wxChar*) filename.t_str()); DWORD dummy; DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy); @@ -183,10 +158,13 @@ wxString wxVersionDLL::GetFileVersion(const wxString& filename) const { void *pVer; UINT sizeInfo; - if ( m_pfnVerQueryValue(buf.data(), _T("\\"), &pVer, &sizeInfo) ) + if ( m_pfnVerQueryValue(buf.data(), + const_cast(wxT("\\")), + &pVer, + &sizeInfo) ) { VS_FIXEDFILEINFO *info = (VS_FIXEDFILEINFO *)pVer; - ver.Printf(_T("%d.%d.%d.%d"), + ver.Printf(wxT("%d.%d.%d.%d"), HIWORD(info->dwFileVersionMS), LOWORD(info->dwFileVersionMS), HIWORD(info->dwFileVersionLS), @@ -206,8 +184,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) { @@ -217,11 +195,12 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, // fill in simple properties details->m_name = wxString::FromAscii(name); - details->m_address = wx_reinterpret_cast(void *, base); + details->m_address = wxUIntToPtr(base); details->m_length = size; // to get the version, we first need the full path - HMODULE hmod = wxGetModuleHandle(name, (void *)base); + const HMODULE + hmod = wxDynamicLibrary::MSWGetModuleHandle(name, details->m_address); if ( hmod ) { wxString fullname = wxGetFullModuleName(hmod); @@ -242,14 +221,26 @@ wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name, // wxDynamicLibrary implementation // ============================================================================ +// ---------------------------------------------------------------------------- +// misc functions +// ---------------------------------------------------------------------------- + +wxDllType wxDynamicLibrary::GetProgramHandle() +{ + return (wxDllType)::GetModuleHandle(NULL); +} + // ---------------------------------------------------------------------------- // loading/unloading DLLs // ---------------------------------------------------------------------------- /* static */ -wxDllType wxDynamicLibrary::RawLoad(const wxString& libname) +wxDllType +wxDynamicLibrary::RawLoad(const wxString& libname, int flags) { - return ::LoadLibrary(libname); + return flags & wxDL_GET_LOADED + ? ::GetModuleHandle(libname.t_str()) + : ::LoadLibrary(libname.t_str()); } /* static */ @@ -261,7 +252,13 @@ void wxDynamicLibrary::Unload(wxDllType handle) /* static */ void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name) { - return ::GetProcAddress(handle, name); + return (void *)::GetProcAddress(handle, +#ifdef __WXWINCE__ + name.c_str() +#else + name.ToAscii() +#endif // __WXWINCE__ + ); } // ---------------------------------------------------------------------------- @@ -273,6 +270,7 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded() { wxDynamicLibraryDetailsArray dlls; +#if wxUSE_DBGHELP if ( wxDbgHelpDLL::Init() ) { // prepare to use functions for version info extraction @@ -289,12 +287,55 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded() ¶ms ) ) { - wxLogLastError(_T("EnumerateLoadedModules")); + wxLogLastError(wxT("EnumerateLoadedModules")); } } +#endif // wxUSE_DBGHELP return dlls; } +/* static */ +WXHMODULE wxDynamicLibrary::MSWGetModuleHandle(const char *name, void *addr) +{ + // we want to use GetModuleHandleEx() instead of usual GetModuleHandle() + // because the former works correctly for comctl32.dll while the latter + // returns NULL when comctl32.dll version 6 is used under XP (note that + // GetModuleHandleEx() is only available under XP and later, coincidence?) + + // check if we can use GetModuleHandleEx + typedef BOOL (WINAPI *GetModuleHandleEx_t)(DWORD, LPCSTR, HMODULE *); + + static const GetModuleHandleEx_t INVALID_FUNC_PTR = (GetModuleHandleEx_t)-1; + + static GetModuleHandleEx_t s_pfnGetModuleHandleEx = INVALID_FUNC_PTR; + if ( s_pfnGetModuleHandleEx == INVALID_FUNC_PTR ) + { + wxDynamicLibrary dll(wxT("kernel32.dll"), wxDL_VERBATIM); + s_pfnGetModuleHandleEx = + (GetModuleHandleEx_t)dll.RawGetSymbol(wxT("GetModuleHandleExA")); + + // dll object can be destroyed, kernel32.dll won't be unloaded anyhow + } + + // get module handle from its address + if ( s_pfnGetModuleHandleEx ) + { + // flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT | + // GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS + HMODULE hmod; + if ( s_pfnGetModuleHandleEx(6, (char *)addr, &hmod) && hmod ) + return hmod; + } + + // Windows CE only has Unicode API, so even we have an ANSI string here, we + // still need to use GetModuleHandleW() there +#ifdef __WXWINCE__ + return ::GetModuleHandleW(wxConvLibc.cMB2WC(name).data()); +#else + return ::GetModuleHandleA((char *)name); +#endif +} + #endif // wxUSE_DYNLIB_CLASS