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

[BUG_FIXED] Fix a crash bug by inserting a new feature.

Browse Source 
git-svn-id: svn://svn.tuxfamily.org/svnroot/notepadplus/repository@158 f5eea248-9336-0410-98b8-ebc06183d4e3
pull/343/head^2
donho 17 years ago
parent 16f5cc9a3c
commit 7a07e38f4f
3 changed files with 16 additions and 13 deletions
Show Stats Download Patch File Download Diff File

8
PowerEditor/installer/nppSetup.nsi
Unescape View File

@ -17,16 +17,16 @@
; Define the application name ; Define the application name
!define APPNAME "Notepad++" !define APPNAME "Notepad++"
!define APPNAMEANDVERSION "Notepad++ v4.8.2" !define APPNAMEANDVERSION "Notepad++ v4.8.5"
!define VERSION_MAJOR 4 !define VERSION_MAJOR 4
!define VERSION_MINOR 82 !define VERSION_MINOR 85
; Main Install settings ; Main Install settings
Name "${APPNAMEANDVERSION}" Name "${APPNAMEANDVERSION}"
InstallDir "$PROGRAMFILES\Notepad++" InstallDir "$PROGRAMFILES\Notepad++"
InstallDirRegKey HKLM "Software\${APPNAME}" "" InstallDirRegKey HKLM "Software\${APPNAME}" ""
OutFile "..\bin\npp.4.8.2.Installer.exe" OutFile "..\bin\npp.4.8.5.Installer.exe"
; GetWindowsVersion ; GetWindowsVersion
; ;
@ -468,7 +468,9 @@ GLOBAL_INST:
CreateShortCut "$SMPROGRAMS\Notepad++\Uninstall.lnk" "$INSTDIR\uninstall.exe" CreateShortCut "$SMPROGRAMS\Notepad++\Uninstall.lnk" "$INSTDIR\uninstall.exe"
; remove unstable plugins ; remove unstable plugins
Delete "$INSTDIR\plugins\HexEditorPlugin.dll"
Delete "$INSTDIR\plugins\HexEditor.dll" Delete "$INSTDIR\plugins\HexEditor.dll"
Delete "$INSTDIR\plugins\MultiClipboard.dll"
; detect the right of ; detect the right of
UserInfo::GetAccountType UserInfo::GetAccountType

15
PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
Unescape View File

@ -199,6 +199,13 @@ LRESULT DockingManager::runProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
} }
case WM_DESTROY: case WM_DESTROY:
{ {
/* unregister window event hooking BEFORE EVERYTHING ELSE */
if (hWndServer == hwnd) {
UnhookWindowsHookEx(gWinCallHook);
gWinCallHook = NULL;
hWndServer = NULL;
}
/* destroy imagelist if it exists */ /* destroy imagelist if it exists */
if (_hImageList != NULL) if (_hImageList != NULL)
{ {
@ -211,13 +218,6 @@ LRESULT DockingManager::runProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
_vContainer[i-1]->destroy(); _vContainer[i-1]->destroy();
delete _vContainer[i-1]; delete _vContainer[i-1];
} }
/* unregister window event hooking */
if (hWndServer == hwnd) {
UnhookWindowsHookEx(gWinCallHook);
gWinCallHook = NULL;
hWndServer = NULL;
}
CoUninitialize(); CoUninitialize();
break; break;
} }
@ -870,3 +870,4 @@ int DockingManager::FindEmptyContainer(void)
return iRetCont; return iRetCont;
} }

6
PowerEditor/src/resource.h
Unescape View File

@ -18,9 +18,9 @@
#ifndef RESOURCE_H #ifndef RESOURCE_H
#define RESOURCE_H #define RESOURCE_H
#define NOTEPAD_PLUS_VERSION "Notepad++ v4.8.2" #define NOTEPAD_PLUS_VERSION "Notepad++ v4.8.5"
#define VERSION_VALUE "4.82\0" // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71 #define VERSION_VALUE "4.85\0" // should be X.Y : ie. if VERSION_DIGITALVALUE == 4, 7, 1, 0 , then X = 4, Y = 71
#define VERSION_DIGITALVALUE 4, 8, 2, 0 #define VERSION_DIGITALVALUE 4, 8, 5, 0
#ifndef IDC_STATIC #ifndef IDC_STATIC
#define IDC_STATIC -1 #define IDC_STATIC -1

Write Preview
Loading…
Cancel
Save