Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

don't load comctl32.dll, just get the handle of the already loaded instance of it instead, this avoids accidentally loading 2 different versions of this DLL in the same process (see #10203)

Browse Source 
git-svn-id: https://svn.wxwidgets.org/svn/wx/wxWidgets/trunk@56863 c3d73ce0-8a6f-49c7-b76d-6d57e0e08775
This commit is contained in:
Vadim Zeitlin
2008-11-20 16:45:45 +00:00
parent 59730a00a6
commit e2d4ce7d36
5 changed files with 41 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
src/msw/window.cpp
View File

@@ -5306,20 +5306,23 @@ bool wxWindowMSW::HandleMouseMove(int x, int y, WXUINT flags)
static bool s_initDone = false;
if ( !s_initDone )
{
wxLogNull noLog;
wxDynamicLibrary dllComCtl32(_T("comctl32.dll"), wxDL_VERBATIM);
// see comment in wxApp::GetComCtl32Version() explaining the
// use of wxDL_GET_LOADED
wxDynamicLibrary dllComCtl32(_T("comctl32.dll"),
wxDL_VERBATIM |
wxDL_QUIET |
wxDL_GET_LOADED);
if ( dllComCtl32.IsLoaded() )
{
s_pfn_TrackMouseEvent = (_TrackMouseEvent_t)
dllComCtl32.GetSymbol(_T("_TrackMouseEvent"));
dllComCtl32.RawGetSymbol(_T("_TrackMouseEvent"));
}
s_initDone = true;
// notice that it's ok to unload comctl32.dll here as it won't
// be really unloaded, being still in use because we link to it
// statically too
// we shouldn't unload comctl32.dll here as we didn't really
// load it above
dllComCtl32.Detach();
}
if ( s_pfn_TrackMouseEvent )