#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
wxDynamicLibrary m_dll;
- DECLARE_NO_COPY_CLASS(wxVersionDLL)
+ wxDECLARE_NO_COPY_CLASS(wxVersionDLL);
};
// class used to create wxDynamicLibraryDetails objects
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);
};
// ----------------------------------------------------------------------------
// GetModuleHandleEx() is only available under XP and later, coincidence?)
// check if we can use GetModuleHandleEx
- typedef BOOL (WINAPI *GetModuleHandleEx_t)(DWORD, LPCTSTR, HMODULE *);
+ 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(_T("kernel32.dll"), wxDL_VERBATIM);
+ wxDynamicLibrary dll(wxT("kernel32.dll"), wxDL_VERBATIM);
s_pfnGetModuleHandleEx =
- (GetModuleHandleEx_t)dll.RawGetSymbol(_T("GetModuleHandleExA"));
+ (GetModuleHandleEx_t)dll.RawGetSymbol(wxT("GetModuleHandleExA"));
// dll object can be destroyed, kernel32.dll won't be unloaded anyhow
}
// flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
// GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
HMODULE hmod;
- if ( s_pfnGetModuleHandleEx(6, (LPCTSTR)addr, &hmod) && hmod )
+ if ( s_pfnGetModuleHandleEx(6, (char *)addr, &hmod) && hmod )
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
+#ifdef __WXWINCE__
+ return ::GetModuleHandleW(wxConvLibc.cMB2WC(name).data());
+#else
+ return ::GetModuleHandleA((char *)name);
+#endif
}
// ============================================================================
// 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
#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(); \
wxString ver;
if ( m_dll.IsLoaded() )
{
- wxChar *pc = wx_const_cast(wxChar *, filename.c_str());
+ wxChar *pc = const_cast<wxChar *>((const wxChar*) filename.t_str());
DWORD dummy;
DWORD sizeVerInfo = m_pfnGetFileVersionInfoSize(pc, &dummy);
{
void *pVer;
UINT sizeInfo;
- if ( m_pfnVerQueryValue(buf.data(), _T("\\"), &pVer, &sizeInfo) )
+ if ( m_pfnVerQueryValue(buf.data(),
+ const_cast<wxChar *>(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),
/* static */
BOOL CALLBACK
-wxDynamicLibraryDetailsCreator::EnumModulesProc(PSTR name,
- DWORD base,
+wxDynamicLibraryDetailsCreator::EnumModulesProc(NameStr_t name,
+ DWORD_32_64 base,
ULONG size,
void *data)
{
// 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);
+ HMODULE hmod = wxGetModuleHandle(name, details->m_address);
if ( hmod )
{
wxString fullname = wxGetFullModuleName(hmod);
// wxDynamicLibrary implementation
// ============================================================================
+// ----------------------------------------------------------------------------
+// misc functions
+// ----------------------------------------------------------------------------
+
+wxDllType wxDynamicLibrary::GetProgramHandle()
+{
+ return (wxDllType)::GetModuleHandle(NULL);
+}
+
// ----------------------------------------------------------------------------
// loading/unloading DLLs
// ----------------------------------------------------------------------------
/* static */
wxDllType
-wxDynamicLibrary::RawLoad(const wxString& libname, int WXUNUSED(flags))
+wxDynamicLibrary::RawLoad(const wxString& libname, int flags)
{
- return ::LoadLibrary(libname);
+ return flags & wxDL_GET_LOADED
+ ? ::GetModuleHandle(libname.t_str())
+ : ::LoadLibrary(libname.t_str());
}
/* static */
/* static */
void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
{
- return ::GetProcAddress(handle, name.ToAscii());
+ return (void *)::GetProcAddress(handle,
+#ifdef __WXWINCE__
+ name.c_str()
+#else
+ name.ToAscii()
+#endif // __WXWINCE__
+ );
}
// ----------------------------------------------------------------------------
¶ms
) )
{
- wxLogLastError(_T("EnumerateLoadedModules"));
+ wxLogLastError(wxT("EnumerateLoadedModules"));
}
}
#endif // wxUSE_DBGHELP
projects / wxWidgets.git / blobdiff