Build fixes.
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@31427 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
@@ -117,7 +117,7 @@ HMODULE wxGetModuleHandle(const char *name, void *addr)
|
|||||||
// flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
|
// flags are GET_MODULE_HANDLE_EX_FLAG_UNCHANGED_REFCOUNT |
|
||||||
// GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
|
// GET_MODULE_HANDLE_EX_FLAG_FROM_ADDRESS
|
||||||
HMODULE hmod;
|
HMODULE hmod;
|
||||||
if ( s_pfnGetModuleHandleEx(6, (char *)addr, &hmod) && hmod )
|
if ( s_pfnGetModuleHandleEx(6, (LPCTSTR)addr, &hmod) && hmod )
|
||||||
return hmod;
|
return hmod;
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -262,7 +262,7 @@ void wxDynamicLibrary::Unload(wxDllType handle)
|
|||||||
/* static */
|
/* static */
|
||||||
void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
|
void *wxDynamicLibrary::RawGetSymbol(wxDllType handle, const wxString& name)
|
||||||
{
|
{
|
||||||
return ::GetProcAddress(handle, name);
|
return ::GetProcAddress(handle, name.ToAscii());
|
||||||
}
|
}
|
||||||
|
|
||||||
// ----------------------------------------------------------------------------
|
// ----------------------------------------------------------------------------
|
||||||
@@ -274,6 +274,7 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
|
|||||||
{
|
{
|
||||||
wxDynamicLibraryDetailsArray dlls;
|
wxDynamicLibraryDetailsArray dlls;
|
||||||
|
|
||||||
|
#if wxUSE_DBGHELP
|
||||||
if ( wxDbgHelpDLL::Init() )
|
if ( wxDbgHelpDLL::Init() )
|
||||||
{
|
{
|
||||||
// prepare to use functions for version info extraction
|
// prepare to use functions for version info extraction
|
||||||
@@ -293,6 +294,7 @@ wxDynamicLibraryDetailsArray wxDynamicLibrary::ListLoaded()
|
|||||||
wxLogLastError(_T("EnumerateLoadedModules"));
|
wxLogLastError(_T("EnumerateLoadedModules"));
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
#endif // wxUSE_DBGHELP
|
||||||
|
|
||||||
return dlls;
|
return dlls;
|
||||||
}
|
}
|
||||||
|
Reference in New Issue
Block a user