more memory fixes

git-svn-id: http://svn.miranda-ng.org/main/trunk@4072 1316c22d-e87f-b044-9b9b-93d7a3e3ba9c

1 files changed, 165 insertions, 196 deletions

diff --git a/plugins/Popup/src/popup_thread.cpp b/plugins/Popup/src/popup_thread.cpp
index cbba209c62..711a65ab95 100644
--- a/plugins/Popup/src/popup_thread.cpp
+++ b/plugins/Popup/src/popup_thread.cpp
@@ -26,21 +26,20 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 //#include <list>

 

 // globals

-//static unsigned idPopupThread = 0;

-static int gIdleRequests = 0;

-static bool gTerminating = false;

+static int    gIdleRequests = 0;

+static bool   gTerminating = false;

 static HANDLE hThreadMutex = NULL;

-static HWND gHwndManager = 0;

-static int gLockCount = 0;

+static HWND   gHwndManager = 0;

+static int    gLockCount = 0;

 static volatile int nPopups = 0;

 

-//typedef std::list<PopupWnd2 *> PopupList;

 typedef LIST<PopupWnd2> PopupList;

-static PopupList popupList(3);

+static PopupList popupList(3, PopupList::FTSortFunc(PtrKeySortT));

 

 // forwards

 enum

-{ // message id's

+{ 

+	// message id's

 	UTM_PT_FIRST = WM_USER+1607,

 	UTM_STOP_THREAD,

 	UTM_ADD_WINDOW,

@@ -51,68 +50,6 @@ enum
 	UTM_UNLOCK_QUEUE,

 	UTM_REQUEST_REMOVE

 };

-static void __cdecl PopupThread(void *arg);

-

-// interface

-void LoadPopupThread()

-{

-	hThreadMutex = CreateMutex(NULL, FALSE, NULL);

-	mir_forkthread(PopupThread, NULL);

-}

-

-void StopPopupThread()

-{

-	PostMessage(gHwndManager, UTM_STOP_THREAD, 0, 0);

-}

-

-void UnloadPopupThread()

-{

-// We won't waint for thread to exit, Miranda's thread unsind mechanism will do that for us.

-	WaitForSingleObject(hThreadMutex, INFINITE);

-	CloseHandle(hThreadMutex);

-}

-

-void PopupThreadLock()

-{

-	PostMessage(gHwndManager, UTM_LOCK_QUEUE, 0, 0);

-}

-

-void PopupThreadUnlock()

-{

-	PostMessage(gHwndManager, UTM_UNLOCK_QUEUE, 0, 0);

-}

-

-bool PopupThreadIsFull()

-{

-//	char buf[128];

-//	wsprintf(buf, "%d, %d", nPopups, PopUpOptions.MaxPopups);

-//	MessageBoxA(NULL, buf, "Popup Plus", MB_OK);

-	return nPopups >= PopUpOptions.MaxPopups;

-}

-

-bool PopupThreadAddWindow(PopupWnd2 *wnd)

-{

-	PostMessage(gHwndManager, UTM_ADD_WINDOW, 0, (LPARAM)wnd);

-	return true;

-}

-

-bool PopupThreadRemoveWindow(PopupWnd2 *wnd)

-{

-	PostMessage(gHwndManager, UTM_REMOVE_WINDOW, 0, (LPARAM)wnd);

-	return true;

-}

-

-bool PopupThreadUpdateWindow(PopupWnd2 *wnd)

-{

-	PostMessage(gHwndManager, UTM_UPDATE_WINDOW, 0, (LPARAM)wnd);

-	return true;

-}

-

-bool PopupThreadRequestRemoveWindow(PopupWnd2 *wnd)

-{

-	PostMessage(gHwndManager, UTM_REQUEST_REMOVE, 0, (LPARAM)wnd);

-	return true;

-}

 

 bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd)

 {

@@ -123,31 +60,25 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd)
 

 	POINT pos;

 	SIZE prevSize = {0}, curSize = wnd->getSize();

-	if (prev) prevSize = prev->getSize();

+	if (prev)

+		prevSize = prev->getSize();

 

+	//we have only one monitor (cant check it together with 1.if)

 	RECT rc;

-//	SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);

-

-

-	if (GetSystemMetrics(SM_CMONITORS)==1) { //we have only one monitor (cant check it together with 1.if)

-		SystemParametersInfo(SPI_GETWORKAREA,0,&rc,0);

-	}

+	if ( GetSystemMetrics(SM_CMONITORS) == 1)

+		SystemParametersInfo(SPI_GETWORKAREA, 0, &rc, 0);

 	else { //Multimonitor stuff (we have more then 1)

-		HMONITOR hMonitor = NULL;

-		HWND hWnd = NULL;

-		MONITORINFOEX mnti; // = { 0 };

-

+		HWND hWnd;

 		if (PopUpOptions.Monitor == MN_MIRANDA)

 			hWnd = (HWND)CallService(MS_CLUI_GETHWND,0,0);

 		else // PopUpOptions.Monitor == MN_ACTIVE

 			hWnd = GetForegroundWindow();

 

-		mnti.cbSize = sizeof(MONITORINFOEX);

-

-

-		hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY);

-		if (GetMonitorInfo(hMonitor, (LPMONITORINFO)&mnti) == TRUE) //It worked

+		HMONITOR hMonitor = MonitorFromWindow(hWnd, MONITOR_DEFAULTTOPRIMARY);

 

+		MONITORINFOEX mnti; 

+		mnti.cbSize = sizeof(MONITORINFOEX);

+		if ( GetMonitorInfo(hMonitor, &mnti) == TRUE)

 			CopyMemory(&rc, &(mnti.rcWork), sizeof(RECT));

 		else

 			SystemParametersInfo(SPI_GETWORKAREA,0,&rc,0);

@@ -157,48 +88,44 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd)
 	rc.right -= PopUpOptions.gapRight - POPUP_SPACING;

 	rc.top += PopUpOptions.gapTop - POPUP_SPACING;

 	rc.bottom -= PopUpOptions.gapBottom - POPUP_SPACING;

-	if (PopUpOptions.Spreading == SPREADING_VERTICAL)

-	{

-		switch (PopUpOptions.Position)

-		{

-			case POS_UPPERLEFT:

-				pos.x = rc.left + POPUP_SPACING;

-				pos.y = (prev ? (prev->getPosition().y + prev->getSize().cy) : rc.top) + POPUP_SPACING;

-				break;

-			case POS_LOWERLEFT:

-				pos.x = rc.left + POPUP_SPACING;

-				pos.y = (prev ? prev->getPosition().y : rc.bottom) - wnd->getSize().cy - POPUP_SPACING;

-				break;

-			case POS_LOWERRIGHT:

-				pos.x = rc.right - wnd->getSize().cx - POPUP_SPACING;

-				pos.y = (prev ? prev->getPosition().y : rc.bottom) - wnd->getSize().cy - POPUP_SPACING;

-				break;

-			case POS_UPPERRIGHT:

-				pos.x = rc.right - wnd->getSize().cx - POPUP_SPACING;

-				pos.y = (prev ? (prev->getPosition().y + prev->getSize().cy) : rc.top) + POPUP_SPACING;

-				break;

+	if (PopUpOptions.Spreading == SPREADING_VERTICAL) {

+		switch (PopUpOptions.Position) {

+		case POS_UPPERLEFT:

+			pos.x = rc.left + POPUP_SPACING;

+			pos.y = (prev ? (prev->getPosition().y + prev->getSize().cy) : rc.top) + POPUP_SPACING;

+			break;

+		case POS_LOWERLEFT:

+			pos.x = rc.left + POPUP_SPACING;

+			pos.y = (prev ? prev->getPosition().y : rc.bottom) - wnd->getSize().cy - POPUP_SPACING;

+			break;

+		case POS_LOWERRIGHT:

+			pos.x = rc.right - wnd->getSize().cx - POPUP_SPACING;

+			pos.y = (prev ? prev->getPosition().y : rc.bottom) - wnd->getSize().cy - POPUP_SPACING;

+			break;

+		case POS_UPPERRIGHT:

+			pos.x = rc.right - wnd->getSize().cx - POPUP_SPACING;

+			pos.y = (prev ? (prev->getPosition().y + prev->getSize().cy) : rc.top) + POPUP_SPACING;

+			break;

 		}

-	} else

-	// if (PopUpOptions.Spreading == SPREADING_HORIZONTAL)

-	{

-		switch (PopUpOptions.Position)

-		{

-			case POS_UPPERLEFT:

-				pos.x = (prev ? (prev->getPosition().x + prev->getSize().cx) : rc.left) + POPUP_SPACING;

-				pos.y = rc.top + POPUP_SPACING;

-				break;

-			case POS_LOWERLEFT:

-				pos.x = (prev ? (prev->getPosition().x + prev->getSize().cx) : rc.left) + POPUP_SPACING;

-				pos.y = rc.bottom - wnd->getSize().cy - POPUP_SPACING;

-				break;

-			case POS_LOWERRIGHT:

-				pos.x = (prev ? prev->getPosition().x : rc.right) - wnd->getSize().cx - POPUP_SPACING;

-				pos.y = rc.bottom - wnd->getSize().cy - POPUP_SPACING;

-				break;

-			case POS_UPPERRIGHT:

-				pos.x = (prev ? prev->getPosition().x : rc.right) - wnd->getSize().cx - POPUP_SPACING;

-				pos.y = rc.top + POPUP_SPACING;

-				break;

+	}

+	else {

+		switch (PopUpOptions.Position) {

+		case POS_UPPERLEFT:

+			pos.x = (prev ? (prev->getPosition().x + prev->getSize().cx) : rc.left) + POPUP_SPACING;

+			pos.y = rc.top + POPUP_SPACING;

+			break;

+		case POS_LOWERLEFT:

+			pos.x = (prev ? (prev->getPosition().x + prev->getSize().cx) : rc.left) + POPUP_SPACING;

+			pos.y = rc.bottom - wnd->getSize().cy - POPUP_SPACING;

+			break;

+		case POS_LOWERRIGHT:

+			pos.x = (prev ? prev->getPosition().x : rc.right) - wnd->getSize().cx - POPUP_SPACING;

+			pos.y = rc.bottom - wnd->getSize().cy - POPUP_SPACING;

+			break;

+		case POS_UPPERRIGHT:

+			pos.x = (prev ? prev->getPosition().x : rc.right) - wnd->getSize().cx - POPUP_SPACING;

+			pos.y = rc.top + POPUP_SPACING;

+			break;

 		}

 	}

 	wnd->setPosition(pos);

@@ -208,10 +135,8 @@ bool UpdatePopupPosition(PopupWnd2 *prev, PopupWnd2 *wnd)
 void RepositionPopups()

 {

 	PopupWnd2 *prev = 0;

-	if (PopUpOptions.ReorderPopUps)

-	{

-		for (int i=0; i < popupList.getCount(); ++i)

-		{

+	if (PopUpOptions.ReorderPopUps) {

+		for (int i=0; i < popupList.getCount(); ++i) {

 			UpdatePopupPosition(prev, popupList[i]);

 			prev = popupList[i];

 		}

@@ -221,75 +146,55 @@ void RepositionPopups()
 static LRESULT CALLBACK PopupThreadManagerWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lParam)

 {

 	PopupWnd2 *wnd = NULL;

-	if (message == UTM_ADD_WINDOW ||

-		message == UTM_UPDATE_WINDOW ||

-		message == UTM_REMOVE_WINDOW ||

-		message == UTM_REQUEST_REMOVE)

-	{

+	if (message == UTM_ADD_WINDOW || message == UTM_UPDATE_WINDOW || message == UTM_REMOVE_WINDOW || message == UTM_REQUEST_REMOVE)

 		if (!(wnd = (PopupWnd2 *)lParam))

 			return 0;

-	}

-	switch (message)

-	{

-		case UTM_STOP_THREAD:

-		{

-			gTerminating = true;

-			if (DBGetContactSettingByte(NULL, MODULNAME, "FastExit", 0))

-				for (int i=0; i < popupList.getCount(); ++i)

-					PUDeletePopUp(popupList[i]->getHwnd());

-			PostQuitMessage(0);

-			break;

-		}

-		case UTM_ADD_WINDOW:

-		{

-			if (gTerminating) break;

-			UpdatePopupPosition(popupList.getCount() ? popupList[popupList.getCount()-1] : 0, wnd);

-			popupList.insert(wnd);

-			++nPopups;

-			wnd->callMethodAsync(&PopupWnd2::m_show, 0);

-			break;

-		}

-		case UTM_UPDATE_WINDOW:

-		{

-			RepositionPopups();

-			break;

-		}

-		case UTM_REQUEST_REMOVE:

-		{

-			if ((PopUpOptions.LeaveHovered && gLockCount) || (wnd && wnd->isLocked()))

-			{

-				wnd->updateTimer();

-			} else

-			{

-				PostMessage(wnd->getHwnd(), WM_CLOSE, 0, 0);

-			}

-			break;

-		}

-		case UTM_REMOVE_WINDOW:

-		{

-			// popupList.remove(ptr) would be nicer, but it requires sortFunc :(

+

+	switch (message) {

+	case UTM_STOP_THREAD:

+		gTerminating = true;

+		if (DBGetContactSettingByte(NULL, MODULNAME, "FastExit", 0))

 			for (int i=0; i < popupList.getCount(); ++i)

-				if (popupList[i] == wnd)

-				{

-					popupList.remove(i);

-					RepositionPopups();

-					--nPopups;

-					delete wnd;

-					break;

-				}

-			break;

-		}

-		case UTM_LOCK_QUEUE:

-		{

-			++gLockCount;

-			break;

-		}

-		case UTM_UNLOCK_QUEUE:

-		{

-			if (--gLockCount < 0)

-				gLockCount = 0;

+				PUDeletePopUp(popupList[i]->getHwnd());

+		PostQuitMessage(0);

+		break;

+

+	case UTM_ADD_WINDOW:

+		if (gTerminating)

 			break;

-		}

+		UpdatePopupPosition(popupList.getCount() ? popupList[popupList.getCount()-1] : 0, wnd);

+		popupList.insert(wnd);

+		++nPopups;

+		wnd->callMethodAsync(&PopupWnd2::m_show, 0);

+		break;

+

+	case UTM_UPDATE_WINDOW:

+		RepositionPopups();

+		break;

+

+	case UTM_REQUEST_REMOVE:

+		if ((PopUpOptions.LeaveHovered && gLockCount) || (wnd && wnd->isLocked()))

+			wnd->updateTimer();

+		else

+			PostMessage(wnd->getHwnd(), WM_CLOSE, 0, 0);

+		break;

+

+	case UTM_REMOVE_WINDOW:

+		popupList.remove(wnd);

+		RepositionPopups();

+		--nPopups;

+		delete wnd;

+		break;

+

+	case UTM_LOCK_QUEUE:

+		++gLockCount;

+		break;

+

+	case UTM_UNLOCK_QUEUE:

+		if (--gLockCount < 0)

+			gLockCount = 0;

+		break;

+

 	}

 	return DefWindowProc(hwnd, message, wParam, lParam);

 }

@@ -342,3 +247,67 @@ static void __cdecl PopupThread(void *arg)
 	DestroyWindow(gHwndManager); gHwndManager = NULL;

 	ReleaseMutex(hThreadMutex); hThreadMutex = NULL;

 }

+

+/////////////////////////////////////////////////////////////////////////////////////////

+// interface

+

+void LoadPopupThread()

+{

+	hThreadMutex = CreateMutex(NULL, FALSE, NULL);

+	mir_forkthread(PopupThread, NULL);

+}

+

+void StopPopupThread()

+{

+	PostMessage(gHwndManager, UTM_STOP_THREAD, 0, 0);

+}

+

+void UnloadPopupThread()

+{

+	// We won't waint for thread to exit, Miranda's thread unsind mechanism will do that for us.

+	WaitForSingleObject(hThreadMutex, INFINITE);

+	CloseHandle(hThreadMutex);

+

+	for (int i=0; i < popupList.getCount(); ++i)

+		delete popupList[i];

+	popupList.destroy();

+}

+

+void PopupThreadLock()

+{

+	PostMessage(gHwndManager, UTM_LOCK_QUEUE, 0, 0);

+}

+

+void PopupThreadUnlock()

+{

+	PostMessage(gHwndManager, UTM_UNLOCK_QUEUE, 0, 0);

+}

+

+bool PopupThreadIsFull()

+{

+	return nPopups >= PopUpOptions.MaxPopups;

+}

+

+bool PopupThreadAddWindow(PopupWnd2 *wnd)

+{

+	PostMessage(gHwndManager, UTM_ADD_WINDOW, 0, (LPARAM)wnd);

+	return true;

+}

+

+bool PopupThreadRemoveWindow(PopupWnd2 *wnd)

+{

+	PostMessage(gHwndManager, UTM_REMOVE_WINDOW, 0, (LPARAM)wnd);

+	return true;

+}

+

+bool PopupThreadUpdateWindow(PopupWnd2 *wnd)

+{

+	PostMessage(gHwndManager, UTM_UPDATE_WINDOW, 0, (LPARAM)wnd);

+	return true;

+}

+

+bool PopupThreadRequestRemoveWindow(PopupWnd2 *wnd)

+{

+	PostMessage(gHwndManager, UTM_REQUEST_REMOVE, 0, (LPARAM)wnd);

+	return true;

+}