#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
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);
};
// ----------------------------------------------------------------------------
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
}
// ============================================================================
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);
/* 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
// ----------------------------------------------------------------------------
wxDllType
wxDynamicLibrary::RawLoad(const wxString& libname, int WXUNUSED(flags))
{
- return ::LoadLibrary(libname);
+ return ::LoadLibrary(libname.wx_str());
}
/* static */
/* 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__
+ );
}
// ----------------------------------------------------------------------------