tyler.durden
/
notepad-plus-plus
mirror of https://github.com/notepad-plus-plus/notepad-plus-plus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

[BUG_FIXED](Author: Pavel Nedev) Remove erroneous use of FreeLibrary(_hUser32). 

git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository/trunk@1330 f5eea248-9336-0410-98b8-ebc06183d4e3
This commit is contained in:
Don Ho 2015-02-01 21:03:01 +00:00
parent a7074ee7b9
commit b1b6f01f34
2 changed files with 4 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
PowerEditor/src/Parameters.cpp
View File

@ -657,7 +657,7 @@ NppParameters::NppParameters() : _pXmlDoc(NULL),_pXmlUserDoc(NULL), _pXmlUserSty
_nbMaxRecentFile(10), _recentFileCustomLength(RECENTFILES_SHOWFULLPATH),\ _nbMaxRecentFile(10), _recentFileCustomLength(RECENTFILES_SHOWFULLPATH),\
_putRecentFileInSubMenu(false), _pXmlShortcutDoc(NULL), _pXmlContextMenuDocA(NULL),\ _putRecentFileInSubMenu(false), _pXmlShortcutDoc(NULL), _pXmlContextMenuDocA(NULL),\
_pXmlSessionDoc(NULL), _pXmlBlacklistDoc(NULL), _nbUserLang(0), _nbExternalLang(0),\ _pXmlSessionDoc(NULL), _pXmlBlacklistDoc(NULL), _nbUserLang(0), _nbExternalLang(0),\
_hUser32(NULL), _hUXTheme(NULL), _transparentFuncAddr(NULL), _enableThemeDialogTextureFuncAddr(NULL),\ _hUXTheme(NULL), _transparentFuncAddr(NULL), _enableThemeDialogTextureFuncAddr(NULL),\
_pNativeLangSpeaker(NULL), _isTaskListRBUTTONUP_Active(false), _fileSaveDlgFilterIndex(-1),\ _pNativeLangSpeaker(NULL), _isTaskListRBUTTONUP_Active(false), _fileSaveDlgFilterIndex(-1),\
_asNotepadStyle(false), _isFindReplacing(false) _asNotepadStyle(false), _isFindReplacing(false)
{ {
@ -702,8 +702,6 @@ NppParameters::~NppParameters()
delete _LRFileList[i]; delete _LRFileList[i];
for (int i = 0 ; i < _nbUserLang ; ++i) for (int i = 0 ; i < _nbUserLang ; ++i)
delete _userLangArray[i]; delete _userLangArray[i];
if (_hUser32)
FreeLibrary(_hUser32);
if (_hUXTheme) if (_hUXTheme)
FreeLibrary(_hUXTheme); FreeLibrary(_hUXTheme);
@ -1218,9 +1216,9 @@ bool NppParameters::load()
//-------------------------------------// //-------------------------------------//
// Transparent function for w2k and xp // // Transparent function for w2k and xp //
//-------------------------------------// //-------------------------------------//
_hUser32 = ::GetModuleHandle(TEXT("User32")); HMODULE hUser32 = ::GetModuleHandle(TEXT("User32"));
if (_hUser32) if (hUser32)
_transparentFuncAddr = (WNDPROC)::GetProcAddress(_hUser32, "SetLayeredWindowAttributes"); _transparentFuncAddr = (WNDPROC)::GetProcAddress(hUser32, "SetLayeredWindowAttributes");
//---------------------------------------------// //---------------------------------------------//
// Dlg theme texture function for xp and vista // // Dlg theme texture function for xp and vista //

1
PowerEditor/src/Parameters.h
View File

@ -1624,7 +1624,6 @@ private:
vector<generic_string> _blacklist; vector<generic_string> _blacklist;
PluginList _pluginList; PluginList _pluginList;
HMODULE _hUser32;
HMODULE _hUXTheme; HMODULE _hUXTheme;
WNDPROC _transparentFuncAddr; WNDPROC _transparentFuncAddr;