Gripper: Remove any modifications post destruction.

- Gripper is a suicidal class and we need to make sure no modification to the class take place after the destructor is called. Doing so screws up the heap. (See case WM_LBUTTONUP, WM_NCLBUTTONUP and DMM_CANCEL_MOVE in Gripper::runProc(.)) - The self pointer passed as parameter in Gripper::startGrip is removed since it was redundant. Signed-off-by: Jocelyn Legault <jocelynlegault@gmail.com> Signed-off-by: Thell Fowler <git@tbfowler.name>
npp-community · Oct 21, 2009 · cdeddfb · cdeddfb
1 parent ed1348f
commit cdeddfb
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 15 deletions.
diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingCont.cpp
@@ -23,8 +23,6 @@
 #include "Tabbar.h"
 #include "npp_winver.h"
 
-#include "Debug/npp_debug.h"
-
 #ifndef WH_MOUSE_LL
 #define WH_MOUSE_LL 14
 #endif

diff --git a/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp b/PowerEditor/src/WinControls/DockingWnd/DockingManager.cpp
@@ -260,9 +260,10 @@ LRESULT DockingManager::runProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM l
 		}
 		case DMM_MOVE:
 		{
-			Gripper*	pGripper = new Gripper;
+			// Gripper will self delete on WM_DESTROY
+			Gripper* pGripper = new Gripper;
 			pGripper->init(_hInst, _hParent);
-			pGripper->startGrip((DockingCont*)lParam, this, pGripper);
+			pGripper->startGrip((DockingCont*)lParam, this);
 			break;
 		}
 		case DMM_MOVE_SPLITTER:

diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp b/PowerEditor/src/WinControls/DockingWnd/Gripper.cpp
@@ -95,8 +95,6 @@ Gripper::Gripper()
 	_startMovingFromTab	= FALSE;
 	_iItem				= 0;
 
-	_pRes               = 0;
-
 	_hdc				= NULL;
 	_hbm				= NULL;
 	_hbrush				= NULL;
@@ -108,11 +106,10 @@ Gripper::Gripper()
 }
 
 
-void Gripper::startGrip(DockingCont* pCont, DockingManager* pDockMgr, void* pRes)
+void Gripper::startGrip(DockingCont* pCont, DockingManager* pDockMgr)
 {
 	_pDockMgr   = pDockMgr;
 	_pCont		= pCont;
-	_pRes		= pRes;
 
 	_pDockMgr->getDockInfo(&_dockData);
 
@@ -209,7 +206,6 @@ LRESULT Gripper::runProc(UINT message, WPARAM wParam, LPARAM lParam)
 			onButtonUp();
 
 			::DestroyWindow(_hSelf);
-			_hSelf = NULL;
 			return TRUE;
 		}
 		case DMM_CANCEL_MOVE:
@@ -228,15 +224,14 @@ LRESULT Gripper::runProc(UINT message, WPARAM wParam, LPARAM lParam)
 			::UnhookWindowsHookEx(hookKeyboard);
 
 			::DestroyWindow(_hSelf);
-			_hSelf = NULL;
 			return FALSE;
 		}
 		case WM_DESTROY:
 		{
 			mouse_event(MOUSEEVENTF_LEFTUP, 0, 0, 0, 0);
 			::SetWindowPos(_hParent, HWND_NOTOPMOST, 0, 0, 0, 0, SWP_NOSIZE | SWP_NOMOVE);
 			_pCont->focusClient();
-			delete _pRes;
+			delete this;
 			break;
 		}
 		default:

diff --git a/PowerEditor/src/WinControls/DockingWnd/Gripper.h b/PowerEditor/src/WinControls/DockingWnd/Gripper.h
@@ -43,7 +43,7 @@ class Gripper
 		_hParent = hParent;
 	};
 
-	void startGrip(DockingCont* pCont, DockingManager* pDockMgr, void* pRes);
+	void startGrip(DockingCont* pCont, DockingManager* pDockMgr);
 
 	~Gripper() {
 		if (_hdc) {
@@ -121,9 +121,6 @@ protected :
 	RECT _rcItem;
 	TCITEM _tcItem;
 
-	// resource pointer of THIS class
-	void *_pRes;
-
 	HDC _hdc;
 	HBITMAP _hbm;
 	HBRUSH _hbrush;