2 files changed, 671 insertions, 750 deletions

diff --git a/plugins/Clist_modern/src/hdr/modern_static_clui.h b/plugins/Clist_modern/src/hdr/modern_static_clui.h
index b381ba1d55..552337cb65 100644
--- a/plugins/Clist_modern/src/hdr/modern_static_clui.h
+++ b/plugins/Clist_modern/src/hdr/modern_static_clui.h
@@ -100,26 +100,15 @@ int CLUI_SizingOnBorder(POINT pt, int size);
 int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam);
 int CLUI_TestCursorOnBorders();
 
-static int CLUI_CreateTimerForConnectingIcon(WPARAM wParam, LPARAM lParam);
 static int CLUI_SmoothAlphaThreadTransition(HWND hwnd);
 
 /*      structs         */
 
-typedef struct tagPROTOTICKS{
-	int     nIconsCount;
-	int     nCycleStartTick;
-	char  * szProto;
-	int     nIndex;
-	BOOL    bTimerCreated;
-	BOOL    bGlobal;
-	HIMAGELIST himlIconList;
-} PROTOTICKS,*LPPROTOTICKS;
-
-typedef struct tagCHECKFILLING
+struct CHECKFILLING
 {
 	HDC hDC;
 	RECT rcRect;
-} CHECKFILLING;
+};
 
 int CheckFramesPos(RECT *wr);			//cluiframes.c
 int CLUIFrames_ApplyNewSizes(int mode); //cluiframes.c
diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 99767a01fe..fd01a532de 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -33,6 +33,29 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include "hdr/modern_clcpaint.h"

 #include "hdr/modern_sync.h"

 

+struct PROTOTICKS
+{
+	~PROTOTICKS()
+	{
+		ImageList_Destroy(himlIconList);
+	}
+
+	ptrA szProto;
+	int  nIconsCount;
+	int  nCycleStartTick;
+	int  nIndex;
+	BOOL bTimerCreated;
+	BOOL bGlobal;
+	HIMAGELIST himlIconList;
+};
+

+static int CompareTicks(const PROTOTICKS *p1, const PROTOTICKS *p2)

+{

+	return strcmp(p1->szProto, p2->szProto);

+}

+

+static OBJLIST<PROTOTICKS> arTicks(1, CompareTicks);

+

 int ContactSettingChanged(WPARAM, LPARAM);

 int MetaStatusChanged(WPARAM, LPARAM);

 

@@ -96,11 +119,9 @@ static RECT rcNewWindowRect={0},
 

 static HANDLE hFrameContactTree;

 

-static PROTOTICKS CycleStartTick[64]={0};//max 64 protocols

-

-static int nAnimatedIconStep=100;

+static int nAnimatedIconStep = 100;

 

-HIMAGELIST hAvatarOverlays=NULL;

+HIMAGELIST hAvatarOverlays = NULL;

 

 OVERLAYICONINFO g_pAvatarOverlayIcons[ID_STATUS_OUTTOLUNCH - ID_STATUS_OFFLINE + 1] =

 {

@@ -217,7 +238,7 @@ INT_PTR CLUI::Service_ShowMainMenu(WPARAM wParam, LPARAM lParam)
 

 	POINT pt;

 	GetCursorPos(&pt);

-	TrackPopupMenu(hMenu,TPM_TOPALIGN|TPM_LEFTALIGN|TPM_LEFTBUTTON,pt.x,pt.y, 0, pcli->hwndContactList,NULL);

+	TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, pcli->hwndContactList, NULL);

 	return 0;

 }

 

@@ -227,7 +248,7 @@ INT_PTR CLUI::Service_ShowStatusMenu(WPARAM wParam, LPARAM lParam)
 

 	POINT pt;

 	GetCursorPos(&pt);

-	TrackPopupMenu(hMenu,TPM_TOPALIGN|TPM_LEFTALIGN|TPM_LEFTBUTTON,pt.x,pt.y, 0, pcli->hwndContactList,NULL);

+	TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, pcli->hwndContactList, NULL);

 	return 0;

 }

 

@@ -329,8 +350,8 @@ HRESULT CLUI::LoadDllsRuntime()
 }

 

 static IconItemT iconItem[] = {

-	{ LPGENT("Show avatar"), "ShowAvatar", IDI_SHOW_AVATAR },

-	{ LPGENT("Hide avatar"), "HideAvatar", IDI_HIDE_AVATAR }

+		{ LPGENT("Show avatar"), "ShowAvatar", IDI_SHOW_AVATAR },

+		{ LPGENT("Hide avatar"), "HideAvatar", IDI_HIDE_AVATAR }

 };

 

 HRESULT CLUI::RegisterAvatarMenu()

@@ -360,14 +381,13 @@ HRESULT CLUI::RegisterAvatarMenu()
 

 HRESULT CLUI::CreateCLCWindow(const HWND hwndClui)

 {

-	ClcWnd() = CreateWindow( _T(CLISTCONTROL_CLASS),_T(""),

-		WS_CHILD|WS_CLIPCHILDREN|CLS_CONTACTLIST

-		|( db_get_b(NULL,"CList","UseGroups",SETTING_USEGROUPS_DEFAULT)?CLS_USEGROUPS:0)

-		|( db_get_b(NULL,"CList","HideOffline",SETTING_HIDEOFFLINE_DEFAULT)?CLS_HIDEOFFLINE:0)

-		|( db_get_b(NULL,"CList","HideEmptyGroups",SETTING_HIDEEMPTYGROUPS_DEFAULT)?CLS_HIDEEMPTYGROUPS:0

-		|CLS_MULTICOLUMN

-		),

-		0, 0, 0, 0, hwndClui,NULL,g_hInst,NULL);

+	ClcWnd() = CreateWindow(_T(CLISTCONTROL_CLASS), _T(""),

+		WS_CHILD | WS_CLIPCHILDREN | CLS_CONTACTLIST

+		| (db_get_b(NULL, "CList", "UseGroups", SETTING_USEGROUPS_DEFAULT) ? CLS_USEGROUPS : 0)

+		| (db_get_b(NULL, "CList", "HideOffline", SETTING_HIDEOFFLINE_DEFAULT) ? CLS_HIDEOFFLINE : 0)

+		| (db_get_b(NULL, "CList", "HideEmptyGroups", SETTING_HIDEEMPTYGROUPS_DEFAULT) ? CLS_HIDEEMPTYGROUPS : 0

+		| CLS_MULTICOLUMN),

+		0, 0, 0, 0, hwndClui, NULL, g_hInst, NULL);

 

 	return S_OK;

 }

@@ -427,17 +447,17 @@ HRESULT CLUI::CreateCLC()
 	Frame.Flags = F_VISIBLE | F_SHOWTBTIP | F_NO_SUBCONTAINER | F_TCHAR;

 	Frame.tname = LPGENT("My contacts");

 	Frame.TBtname = TranslateT("My contacts");

-	hFrameContactTree = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&Frame,0);

+	hFrameContactTree = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM)&Frame, 0);

 

-	CallService(MS_SKINENG_REGISTERPAINTSUB,(WPARAM)Frame.hWnd,(LPARAM)CLCPaint::PaintCallbackProc);

-	CallService(MS_CLIST_FRAMES_SETFRAMEOPTIONS,MAKEWPARAM(FO_TBTIPNAME,hFrameContactTree),(LPARAM)Translate("My Contacts"));

+	CallService(MS_SKINENG_REGISTERPAINTSUB, (WPARAM)Frame.hWnd, (LPARAM)CLCPaint::PaintCallbackProc);

+	CallService(MS_CLIST_FRAMES_SETFRAMEOPTIONS, MAKEWPARAM(FO_TBTIPNAME, hFrameContactTree), (LPARAM)Translate("My Contacts"));

 

 	pcli->pfnReloadExtraIcons();

 

 	nLastRequiredHeight = 0;

 	if (g_CluiData.current_viewmode[0] == '\0') {

 		if (bOldHideOffline != (BYTE)-1)

-			CallService(MS_CLIST_SETHIDEOFFLINE,(WPARAM)bOldHideOffline, 0);

+			CallService(MS_CLIST_SETHIDEOFFLINE, (WPARAM)bOldHideOffline, 0);

 		else

 			CallService(MS_CLIST_SETHIDEOFFLINE, 0, 0);

 		if (bOldUseGroups != (BYTE)-1)

@@ -453,30 +473,30 @@ HRESULT CLUI::CreateCLC()
 	return S_OK;

 }

 

-HRESULT CLUI::SnappingToEdge( WINDOWPOS *lpWindowPos )

+HRESULT CLUI::SnappingToEdge(WINDOWPOS *lpWindowPos)

 {

-	if ( db_get_b(NULL, "CLUI", "SnapToEdges", SETTING_SNAPTOEDGES_DEFAULT)) {

+	if (db_get_b(NULL, "CLUI", "SnapToEdges", SETTING_SNAPTOEDGES_DEFAULT)) {

 		HMONITOR curMonitor = MonitorFromWindow(m_hWnd, MONITOR_DEFAULTTONEAREST);

 		MONITORINFO monInfo;

 		monInfo.cbSize = sizeof(monInfo);

 		GetMonitorInfo(curMonitor, &monInfo);

 

-		RECT* dr = &(monInfo.rcWork);

+		RECT *dr = &monInfo.rcWork;

 

 		// Left side

-		if ( lpWindowPos->x < dr->left + SNAPTOEDGESENSIVITY && lpWindowPos->x > dr->left - SNAPTOEDGESENSIVITY && g_CluiData.bBehindEdgeSettings != 1)

+		if (lpWindowPos->x < dr->left + SNAPTOEDGESENSIVITY && lpWindowPos->x > dr->left - SNAPTOEDGESENSIVITY && g_CluiData.bBehindEdgeSettings != 1)

 			lpWindowPos->x = dr->left;

 

 		// Right side

-		if ( dr->right - lpWindowPos->x - lpWindowPos->cx  < SNAPTOEDGESENSIVITY && dr->right - lpWindowPos->x - lpWindowPos->cx > -SNAPTOEDGESENSIVITY && g_CluiData.bBehindEdgeSettings != 2)

+		if (dr->right - lpWindowPos->x - lpWindowPos->cx  < SNAPTOEDGESENSIVITY && dr->right - lpWindowPos->x - lpWindowPos->cx > -SNAPTOEDGESENSIVITY && g_CluiData.bBehindEdgeSettings != 2)

 			lpWindowPos->x = dr->right - lpWindowPos->cx;

 

 		// Top side

-		if ( lpWindowPos->y < dr->top + SNAPTOEDGESENSIVITY && lpWindowPos->y > dr->top - SNAPTOEDGESENSIVITY)

+		if (lpWindowPos->y < dr->top + SNAPTOEDGESENSIVITY && lpWindowPos->y > dr->top - SNAPTOEDGESENSIVITY)

 			lpWindowPos->y = dr->top;

 

 		// Bottom side

-		if ( dr->bottom - lpWindowPos->y - lpWindowPos->cy  < SNAPTOEDGESENSIVITY && dr->bottom - lpWindowPos->y - lpWindowPos->cy > -SNAPTOEDGESENSIVITY)

+		if (dr->bottom - lpWindowPos->y - lpWindowPos->cy  < SNAPTOEDGESENSIVITY && dr->bottom - lpWindowPos->y - lpWindowPos->cy > -SNAPTOEDGESENSIVITY)

 			lpWindowPos->y = dr->bottom - lpWindowPos->cy;

 	}

 	return S_OK;

@@ -484,7 +504,7 @@ HRESULT CLUI::SnappingToEdge( WINDOWPOS *lpWindowPos )
 

 HICON GetMainStatusOverlay(int STATUS)

 {

-	return ImageList_GetIcon(hAvatarOverlays,g_pStatusOverlayIcons[STATUS-ID_STATUS_OFFLINE].listID,ILD_NORMAL);

+	return ImageList_GetIcon(hAvatarOverlays, g_pStatusOverlayIcons[STATUS - ID_STATUS_OFFLINE].listID, ILD_NORMAL);

 }

 

 void UnloadAvatarOverlayIcon()

@@ -510,7 +530,7 @@ BOOL CLUI_CheckOwnedByClui(HWND hWnd)
 		return TRUE;

 

 	TCHAR buf[255];

-	GetClassName(hWndMid,buf,254);

+	GetClassName(hWndMid, buf, 254);

 	if (!mir_tstrcmpi(buf, CLUIFrameSubContainerClassName))

 		return TRUE;

 

@@ -526,31 +546,31 @@ int CLUI_ShowWindowMod(HWND hWnd, int nCmd)
 		AniAva_RemoveInvalidatedAvatars();

 	}

 

-	if (hWnd == pcli->hwndContactList

-		 &&  !g_mutex_bChangingMode

-		 &&  nCmd == SW_HIDE

-		 &&  !g_CluiData.fLayered

-		 &&  db_get_b(NULL,"CList","WindowShadow",SETTING_WINDOWSHADOW_DEFAULT))

+	if (hWnd == pcli->hwndContactList &&

+		!g_mutex_bChangingMode &&

+		nCmd == SW_HIDE &&

+		!g_CluiData.fLayered &&

+		db_get_b(NULL, "CList", "WindowShadow", SETTING_WINDOWSHADOW_DEFAULT))

 	{

-		ShowWindow(hWnd,SW_MINIMIZE); //removing of shadow

-		return ShowWindow(hWnd,nCmd);

-	}

-	if (hWnd == pcli->hwndContactList

-		 &&  !g_mutex_bChangingMode

-		 &&  nCmd == SW_RESTORE

-		 &&  !g_CluiData.fLayered

-		 &&  g_CluiData.fSmoothAnimation

-		 &&  !g_bTransparentFlag)

+		ShowWindow(hWnd, SW_MINIMIZE); //removing of shadow

+		return ShowWindow(hWnd, nCmd);

+	}

+	if (hWnd == pcli->hwndContactList &&

+		!g_mutex_bChangingMode &&

+		nCmd == SW_RESTORE &&

+		!g_CluiData.fLayered &&

+		g_CluiData.fSmoothAnimation &&

+		!g_bTransparentFlag)

 	{

-		if ( db_get_b(NULL,"CList","WindowShadow",SETTING_WINDOWSHADOW_DEFAULT))

+		if (db_get_b(NULL, "CList", "WindowShadow", SETTING_WINDOWSHADOW_DEFAULT))

 			CLUI_SmoothAlphaTransition(hWnd, 255, 1);

 		else {

-			int ret = ShowWindow(hWnd,nCmd);

+			int ret = ShowWindow(hWnd, nCmd);

 			CLUI_SmoothAlphaTransition(hWnd, 255, 1);

 			return ret;

 		}

 	}

-	return ShowWindow(hWnd,nCmd);

+	return ShowWindow(hWnd, nCmd);

 }

 

 static BOOL CLUI_WaitThreadsCompletion(HWND hwnd)

@@ -558,19 +578,15 @@ static BOOL CLUI_WaitThreadsCompletion(HWND hwnd)
 	static BYTE bEntersCount = 0;

 	static const BYTE bcMAX_AWAITING_RETRY = 10; //repeat awaiting only 10 times

 	TRACE("CLUI_WaitThreadsCompletion Enter");

-	if (bEntersCount < bcMAX_AWAITING_RETRY &&

-		( g_mutex_nCalcRowHeightLock ||

-		  g_CluiData.mutexPaintLock ||

-		  g_hAwayMsgThread ||

-		  g_hGetTextAsyncThread ||

-		  g_hSmoothAnimationThread) && !Miranda_Terminated())

+	if (bEntersCount < bcMAX_AWAITING_RETRY && 

+		(g_mutex_nCalcRowHeightLock || g_CluiData.mutexPaintLock || g_hAwayMsgThread || g_hGetTextAsyncThread || g_hSmoothAnimationThread) && !Miranda_Terminated())

 	{

 		TRACE("Waiting threads");

-		TRACEVAR("g_mutex_nCalcRowHeightLock: %x",g_mutex_nCalcRowHeightLock);

-		TRACEVAR("g_CluiData.mutexPaintLock: %x",g_CluiData.mutexPaintLock);

-		TRACEVAR("g_hAwayMsgThread: %x",g_hAwayMsgThread);

-		TRACEVAR("g_hGetTextAsyncThread: %x",g_hGetTextAsyncThread);

-		TRACEVAR("g_hSmoothAnimationThread: %x",g_hSmoothAnimationThread);

+		TRACEVAR("g_mutex_nCalcRowHeightLock: %x", g_mutex_nCalcRowHeightLock);

+		TRACEVAR("g_CluiData.mutexPaintLock: %x", g_CluiData.mutexPaintLock);

+		TRACEVAR("g_hAwayMsgThread: %x", g_hAwayMsgThread);

+		TRACEVAR("g_hGetTextAsyncThread: %x", g_hGetTextAsyncThread);

+		TRACEVAR("g_hSmoothAnimationThread: %x", g_hSmoothAnimationThread);

 

 		bEntersCount++;

 		SleepEx(10, TRUE);

@@ -582,30 +598,30 @@ static BOOL CLUI_WaitThreadsCompletion(HWND hwnd)
 

 void CLUI_UpdateLayeredMode()

 {

-	g_CluiData.fDisableSkinEngine = db_get_b(NULL,"ModernData","DisableEngine", SETTING_DISABLESKIN_DEFAULT);

+	g_CluiData.fDisableSkinEngine = db_get_b(NULL, "ModernData", "DisableEngine", SETTING_DISABLESKIN_DEFAULT);

 	BOOL tLayeredFlag = TRUE;

-	tLayeredFlag &= ( db_get_b(NULL, "ModernData", "EnableLayering", tLayeredFlag) && !g_CluiData.fDisableSkinEngine);

+	tLayeredFlag &= (db_get_b(NULL, "ModernData", "EnableLayering", tLayeredFlag) && !g_CluiData.fDisableSkinEngine);

 

 	if (g_CluiData.fLayered != tLayeredFlag) {

 		BOOL fWasVisible = IsWindowVisible(pcli->hwndContactList);

 		if (fWasVisible)

-			ShowWindow(pcli->hwndContactList,SW_HIDE);

+			ShowWindow(pcli->hwndContactList, SW_HIDE);

 

 		//change layered mode

-		LONG_PTR exStyle = GetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE);

+		LONG_PTR exStyle = GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE);

 		if (tLayeredFlag)

 			exStyle |= WS_EX_LAYERED;

 		else

 			exStyle &= ~WS_EX_LAYERED;

 

-		SetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE,exStyle&~WS_EX_LAYERED);

-		SetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE,exStyle);

+		SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, exStyle&~WS_EX_LAYERED);

+		SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, exStyle);

 		g_CluiData.fLayered = tLayeredFlag;

-		Sync(CLUIFrames_SetLayeredMode, tLayeredFlag,pcli->hwndContactList);

+		Sync(CLUIFrames_SetLayeredMode, tLayeredFlag, pcli->hwndContactList);

 		CLUI_ChangeWindowMode();

-		Sync(CLUIFrames_OnClistResize_mod, 0, 0 );

+		Sync(CLUIFrames_OnClistResize_mod, 0, 0);

 		if (fWasVisible)

-			ShowWindow(pcli->hwndContactList,SW_SHOW);

+			ShowWindow(pcli->hwndContactList, SW_SHOW);

 	}

 }

 

@@ -618,7 +634,7 @@ void CLUI_UpdateAeroGlass()
 			g_CluiData.hAeroGlassRgn = 0;

 		}

 

-		DWM_BLURBEHIND bb = {0};

+		DWM_BLURBEHIND bb = { 0 };

 		bb.dwFlags = DWM_BB_ENABLE;

 		bb.fEnable = tAeroGlass;

 

@@ -638,15 +654,15 @@ extern int CLUIFrames_UpdateBorders();
 void CLUI_ChangeWindowMode()

 {

 	BOOL storedVisMode = FALSE;

-	LONG_PTR style,styleEx;

-	LONG_PTR oldStyle,oldStyleEx;

-	LONG_PTR styleMask = WS_CLIPCHILDREN|WS_BORDER|WS_CAPTION|WS_MINIMIZEBOX|WS_POPUPWINDOW|WS_CLIPCHILDREN|WS_THICKFRAME|WS_SYSMENU;

-	LONG_PTR styleMaskEx = WS_EX_TOOLWINDOW|WS_EX_LAYERED;

-	LONG_PTR curStyle,curStyleEx;

+	LONG_PTR style, styleEx;

+	LONG_PTR oldStyle, oldStyleEx;

+	LONG_PTR styleMask = WS_CLIPCHILDREN | WS_BORDER | WS_CAPTION | WS_MINIMIZEBOX | WS_POPUPWINDOW | WS_CLIPCHILDREN | WS_THICKFRAME | WS_SYSMENU;

+	LONG_PTR styleMaskEx = WS_EX_TOOLWINDOW | WS_EX_LAYERED;

+	LONG_PTR curStyle, curStyleEx;

 	if (!pcli->hwndContactList) return;

 

 	g_mutex_bChangingMode = TRUE;

-	g_bTransparentFlag = db_get_b( NULL,"CList","Transparent",SETTING_TRANSPARENT_DEFAULT);

+	g_bTransparentFlag = db_get_b(NULL, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT);

 	g_CluiData.fSmoothAnimation = db_get_b(NULL, "CLUI", "FadeInOut", SETTING_FADEIN_DEFAULT);

 	if (g_bTransparentFlag == 0 && g_CluiData.bCurrentAlpha != 0)

 		g_CluiData.bCurrentAlpha = 255;

@@ -654,20 +670,20 @@ void CLUI_ChangeWindowMode()
 	if (!g_CluiData.fLayered) {

 		style = 0;

 		styleEx = 0;

-		if ( db_get_b(NULL,"CList","ThinBorder",SETTING_THINBORDER_DEFAULT) || ( db_get_b(NULL,"CList","NoBorder",SETTING_NOBORDER_DEFAULT))) {

-			style = WS_CLIPCHILDREN| ( db_get_b(NULL,"CList","ThinBorder",SETTING_THINBORDER_DEFAULT)?WS_BORDER:0);

+		if (db_get_b(NULL, "CList", "ThinBorder", SETTING_THINBORDER_DEFAULT) || (db_get_b(NULL, "CList", "NoBorder", SETTING_NOBORDER_DEFAULT))) {

+			style = WS_CLIPCHILDREN | (db_get_b(NULL, "CList", "ThinBorder", SETTING_THINBORDER_DEFAULT) ? WS_BORDER : 0);

 			styleEx = WS_EX_TOOLWINDOW;

 			styleMaskEx |= WS_EX_APPWINDOW;

 		}

-		else if ( db_get_b(NULL,"CLUI","ShowCaption",SETTING_SHOWCAPTION_DEFAULT) && db_get_b(NULL,"CList","ToolWindow",SETTING_TOOLWINDOW_DEFAULT)) {

+		else if (db_get_b(NULL, "CLUI", "ShowCaption", SETTING_SHOWCAPTION_DEFAULT) && db_get_b(NULL, "CList", "ToolWindow", SETTING_TOOLWINDOW_DEFAULT)) {

 			styleEx = WS_EX_TOOLWINDOW/*|WS_EX_WINDOWEDGE*/;

-			style = WS_CAPTION|WS_POPUPWINDOW|WS_CLIPCHILDREN|WS_THICKFRAME;

+			style = WS_CAPTION | WS_POPUPWINDOW | WS_CLIPCHILDREN | WS_THICKFRAME;

 			styleMaskEx |= WS_EX_APPWINDOW;

 		}

-		else if ( db_get_b(NULL,"CLUI","ShowCaption",SETTING_SHOWCAPTION_DEFAULT))

-			style = WS_CAPTION|WS_SYSMENU|WS_POPUPWINDOW|WS_CLIPCHILDREN|WS_THICKFRAME|WS_MINIMIZEBOX;

+		else if (db_get_b(NULL, "CLUI", "ShowCaption", SETTING_SHOWCAPTION_DEFAULT))

+			style = WS_CAPTION | WS_SYSMENU | WS_POPUPWINDOW | WS_CLIPCHILDREN | WS_THICKFRAME | WS_MINIMIZEBOX;

 		else {

-			style = WS_POPUPWINDOW|WS_CLIPCHILDREN|WS_THICKFRAME;

+			style = WS_POPUPWINDOW | WS_CLIPCHILDREN | WS_THICKFRAME;

 			styleEx = WS_EX_TOOLWINDOW/*|WS_EX_WINDOWEDGE*/;

 			styleMaskEx |= WS_EX_APPWINDOW;

 		}

@@ -682,29 +698,29 @@ void CLUI_ChangeWindowMode()
 		styleEx |= WS_EX_LAYERED;

 

 	//4- Set Title

-	TCHAR titleText[255] = {0};

+	TCHAR titleText[255] = { 0 };

 	DBVARIANT dbv;

-	if ( db_get_ts(NULL, "CList", "TitleText", &dbv))

-		lstrcpyn(titleText,_T(MIRANDANAME),SIZEOF(titleText));

+	if (db_get_ts(NULL, "CList", "TitleText", &dbv))

+		lstrcpyn(titleText, _T(MIRANDANAME), SIZEOF(titleText));

 	else {

-		lstrcpyn(titleText,dbv.ptszVal,SIZEOF(titleText));

+		lstrcpyn(titleText, dbv.ptszVal, SIZEOF(titleText));

 		db_free(&dbv);

 	}

-	SetWindowText(pcli->hwndContactList,titleText);

+	SetWindowText(pcli->hwndContactList, titleText);

 

 	// < ->

 	//1- If visible store it and hide

 

-	if (g_CluiData.fLayered && ( db_get_b(NULL,"CList","OnDesktop", SETTING_ONDESKTOP_DEFAULT))) {

-		SetParent(pcli->hwndContactList,NULL);

-		Sync( CLUIFrames_SetParentForContainers, (HWND) NULL );

+	if (g_CluiData.fLayered && (db_get_b(NULL, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT))) {

+		SetParent(pcli->hwndContactList, NULL);

+		Sync(CLUIFrames_SetParentForContainers, (HWND)NULL);

 		UpdateWindow(pcli->hwndContactList);

 		g_CluiData.fOnDesktop = 0;

 	}

 

 	//5- TODO Apply Style

-	oldStyleEx = curStyleEx = GetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE);

-	oldStyle = curStyle = GetWindowLongPtr(pcli->hwndContactList,GWL_STYLE);

+	oldStyleEx = curStyleEx = GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE);

+	oldStyle = curStyle = GetWindowLongPtr(pcli->hwndContactList, GWL_STYLE);

 

 	curStyleEx = (curStyleEx & ~styleMaskEx) | styleEx;

 	curStyle = (curStyle & ~styleMask) | style;

@@ -712,43 +728,43 @@ void CLUI_ChangeWindowMode()
 		if (IsWindowVisible(pcli->hwndContactList)) {

 			storedVisMode = TRUE;

 			mutex_bShowHideCalledFromAnimation = TRUE;

-			ShowWindow(pcli->hwndContactList,SW_HIDE);

-			Sync(CLUIFrames_OnShowHide, pcli->hwndContactList,0);

+			ShowWindow(pcli->hwndContactList, SW_HIDE);

+			Sync(CLUIFrames_OnShowHide, pcli->hwndContactList, 0);

 		}

-		SetWindowLongPtr(pcli->hwndContactList,GWL_EXSTYLE,curStyleEx);

-		SetWindowLongPtr(pcli->hwndContactList,GWL_STYLE,curStyle);

+		SetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE, curStyleEx);

+		SetWindowLongPtr(pcli->hwndContactList, GWL_STYLE, curStyle);

 	}

 

 	CLUI_UpdateAeroGlass();

 

-	if (g_CluiData.fLayered || !db_get_b(NULL,"CLUI","ShowMainMenu",SETTING_SHOWMAINMENU_DEFAULT)) {

+	if (g_CluiData.fLayered || !db_get_b(NULL, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT)) {

 		HMENU m = GetMenu(pcli->hwndContactList);

-		SetMenu(pcli->hwndContactList,NULL);

+		SetMenu(pcli->hwndContactList, NULL);

 	}

-	else SetMenu(pcli->hwndContactList,g_hMenuMain);

+	else SetMenu(pcli->hwndContactList, g_hMenuMain);

 

-	if (g_CluiData.fLayered && ( db_get_b(NULL,"CList","OnDesktop", SETTING_ONDESKTOP_DEFAULT)))

+	if (g_CluiData.fLayered && (db_get_b(NULL, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT)))

 		ske_UpdateWindowImage();

 

 	//6- Pin to desktop mode

-	if ( db_get_b(NULL,"CList","OnDesktop", SETTING_ONDESKTOP_DEFAULT)) {

-		HWND hProgMan = FindWindow(_T("Progman"),NULL);

+	if (db_get_b(NULL, "CList", "OnDesktop", SETTING_ONDESKTOP_DEFAULT)) {

+		HWND hProgMan = FindWindow(_T("Progman"), NULL);

 		if (IsWindow(hProgMan)) {

-			SetParent(pcli->hwndContactList,hProgMan);

-			Sync( CLUIFrames_SetParentForContainers, (HWND) hProgMan );

+			SetParent(pcli->hwndContactList, hProgMan);

+			Sync(CLUIFrames_SetParentForContainers, (HWND)hProgMan);

 			g_CluiData.fOnDesktop = 1;

 		}

 	}

 	else {

-		SetParent(pcli->hwndContactList,NULL);

-		Sync(CLUIFrames_SetParentForContainers, (HWND) NULL);

+		SetParent(pcli->hwndContactList, NULL);

+		Sync(CLUIFrames_SetParentForContainers, (HWND)NULL);

 		g_CluiData.fOnDesktop = 0;

 	}

 

 	//7- if it was visible - show

 	if (storedVisMode) {

-		ShowWindow(pcli->hwndContactList,SW_SHOW);

-		Sync(CLUIFrames_OnShowHide, pcli->hwndContactList,1);

+		ShowWindow(pcli->hwndContactList, SW_SHOW);

+		Sync(CLUIFrames_OnShowHide, pcli->hwndContactList, 1);

 	}

 	mutex_bShowHideCalledFromAnimation = FALSE;

 

@@ -757,21 +773,21 @@ void CLUI_ChangeWindowMode()
 	if (!g_CluiData.fLayered) {

 		HRGN hRgn1;

 		RECT r;

-		int v,h;

+		int v, h;

 		int w = 10;

-		GetWindowRect(pcli->hwndContactList,&r);

-		h = (r.right-r.left)>(w*2)?w:(r.right-r.left);

-		v = (r.bottom-r.top)>(w*2)?w:(r.bottom-r.top);

-		h = (h < v)?h:v;

-		hRgn1 = CreateRoundRectRgn(0, 0, (r.right-r.left+1),(r.bottom-r.top+1),h,h);

-		if (( db_get_b(NULL,"CLC","RoundCorners",SETTING_ROUNDCORNERS_DEFAULT)) && (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0)))

-			SetWindowRgn(pcli->hwndContactList,hRgn1,1);

+		GetWindowRect(pcli->hwndContactList, &r);

+		h = (r.right - r.left) > (w * 2) ? w : (r.right - r.left);

+		v = (r.bottom - r.top) > (w * 2) ? w : (r.bottom - r.top);

+		h = (h < v) ? h : v;

+		hRgn1 = CreateRoundRectRgn(0, 0, (r.right - r.left + 1), (r.bottom - r.top + 1), h, h);

+		if ((db_get_b(NULL, "CLC", "RoundCorners", SETTING_ROUNDCORNERS_DEFAULT)) && (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0)))

+			SetWindowRgn(pcli->hwndContactList, hRgn1, 1);

 		else {

 			DeleteObject(hRgn1);

-			SetWindowRgn(pcli->hwndContactList,NULL,1);

+			SetWindowRgn(pcli->hwndContactList, NULL, 1);

 		}

 

-		RedrawWindow(pcli->hwndContactList,NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_FRAME|RDW_UPDATENOW|RDW_ALLCHILDREN);

+		RedrawWindow(pcli->hwndContactList, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_UPDATENOW | RDW_ALLCHILDREN);

 	}

 	g_mutex_bChangingMode = FALSE;

 	flag_bFirstTimeCall = TRUE;

@@ -786,28 +802,28 @@ struct  _tagTimerAsync
 	TIMERPROC proc;

 };

 

-static UINT_PTR SetTimerSync(WPARAM wParam , LPARAM lParam)

+static UINT_PTR SetTimerSync(WPARAM wParam, LPARAM lParam)

 {

 	struct  _tagTimerAsync * call = (struct  _tagTimerAsync *) wParam;

-	return SetTimer(call->hwnd, call->ID ,call->Timeout, call->proc);

+	return SetTimer(call->hwnd, call->ID, call->Timeout, call->proc);

 }

 

 UINT_PTR CLUI_SafeSetTimer(HWND hwnd, int ID, int Timeout, TIMERPROC proc)

 {

-	struct  _tagTimerAsync param = {  hwnd, ID, Timeout, proc };

-	return Sync(SetTimerSync, (WPARAM) &param, (LPARAM) 0);

+	struct  _tagTimerAsync param = { hwnd, ID, Timeout, proc };

+	return Sync(SetTimerSync, (WPARAM)&param, (LPARAM)0);

 }

 

 int CLUI_UpdateTimer(BYTE BringIn)

 {

 	if (g_CluiData.nBehindEdgeState == 0) {

-		KillTimer(pcli->hwndContactList,TM_BRINGOUTTIMEOUT);

-		CLUI_SafeSetTimer(pcli->hwndContactList,TM_BRINGOUTTIMEOUT,wBehindEdgeHideDelay*100, NULL);

+		KillTimer(pcli->hwndContactList, TM_BRINGOUTTIMEOUT);

+		CLUI_SafeSetTimer(pcli->hwndContactList, TM_BRINGOUTTIMEOUT, wBehindEdgeHideDelay * 100, NULL);

 	}

 

 	if (bShowEventStarted == 0 && g_CluiData.nBehindEdgeState > 0) {

-		KillTimer(pcli->hwndContactList,TM_BRINGINTIMEOUT);

-		bShowEventStarted = (BOOL)CLUI_SafeSetTimer(pcli->hwndContactList,TM_BRINGINTIMEOUT,wBehindEdgeShowDelay*100, NULL);

+		KillTimer(pcli->hwndContactList, TM_BRINGINTIMEOUT);

+		bShowEventStarted = (BOOL)CLUI_SafeSetTimer(pcli->hwndContactList, TM_BRINGINTIMEOUT, wBehindEdgeShowDelay * 100, NULL);

 	}

 	return 0;

 }

@@ -822,26 +838,26 @@ int CLUI_HideBehindEdge()
 		//Need to be moved out of screen

 		bShowEventStarted = 0;

 		//1. get work area rectangle

-		Docking_GetMonitorRectFromWindow(pcli->hwndContactList,&rcScreen);

+		Docking_GetMonitorRectFromWindow(pcli->hwndContactList, &rcScreen);

 		//SystemParametersInfo(SPI_GETWORKAREA, 0, &rcScreen,FALSE);

 		//2. move out

 		bordersize = wBehindEdgeBorderSize;

-		GetWindowRect(pcli->hwndContactList,&rcWindow);

+		GetWindowRect(pcli->hwndContactList, &rcWindow);

 		switch (method) {

 		case 1: //left

-			rcWindow.left = rcScreen.left-(rcWindow.right-rcWindow.left)+bordersize;

+			rcWindow.left = rcScreen.left - (rcWindow.right - rcWindow.left) + bordersize;

 			break;

 		case 2: //right

-			rcWindow.left = rcScreen.right-bordersize;

+			rcWindow.left = rcScreen.right - bordersize;

 			break;

 		}

 		g_CluiData.mutexPreventDockMoving = 0;

-		SetWindowPos(pcli->hwndContactList,NULL,rcWindow.left,rcWindow.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE|SWP_NOACTIVATE);

-		Sync(CLUIFrames_OnMoving,pcli->hwndContactList,&rcWindow);

+		SetWindowPos(pcli->hwndContactList, NULL, rcWindow.left, rcWindow.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE | SWP_NOACTIVATE);

+		Sync(CLUIFrames_OnMoving, pcli->hwndContactList, &rcWindow);

 		g_CluiData.mutexPreventDockMoving = 1;

 

 		//3. store setting

-		db_set_b(NULL, "ModernData", "BehindEdge",method);

+		db_set_b(NULL, "ModernData", "BehindEdge", method);

 		g_CluiData.nBehindEdgeState = method;

 		return 1;

 	}

@@ -866,26 +882,26 @@ int CLUI_ShowFromBehindEdge()
 

 		//1. get work area rectangle

 		//SystemParametersInfo(SPI_GETWORKAREA, 0, &rcScreen,FALSE);

-		Docking_GetMonitorRectFromWindow(pcli->hwndContactList,&rcScreen);

+		Docking_GetMonitorRectFromWindow(pcli->hwndContactList, &rcScreen);

 

 		//2. move out

 		bordersize = wBehindEdgeBorderSize;

-		GetWindowRect(pcli->hwndContactList,&rcWindow);

+		GetWindowRect(pcli->hwndContactList, &rcWindow);

 		switch (method) {

 		case 1: //left

 			rcWindow.left = rcScreen.left;

 			break;

 		case 2: //right

-			rcWindow.left = rcScreen.right-(rcWindow.right-rcWindow.left);

+			rcWindow.left = rcScreen.right - (rcWindow.right - rcWindow.left);

 			break;

 		}

 		g_CluiData.mutexPreventDockMoving = 0;

-		SetWindowPos(pcli->hwndContactList,NULL,rcWindow.left,rcWindow.top, 0, 0, SWP_NOZORDER|SWP_NOSIZE);

-		Sync(CLUIFrames_OnMoving,pcli->hwndContactList,&rcWindow);

+		SetWindowPos(pcli->hwndContactList, NULL, rcWindow.left, rcWindow.top, 0, 0, SWP_NOZORDER | SWP_NOSIZE);

+		Sync(CLUIFrames_OnMoving, pcli->hwndContactList, &rcWindow);

 		g_CluiData.mutexPreventDockMoving = 1;

 

 		//3. store setting

-		db_set_b(NULL, "ModernData", "BehindEdge",0);

+		db_set_b(NULL, "ModernData", "BehindEdge", 0);

 		g_CluiData.nBehindEdgeState = 0;

 	}

 	return 0;

@@ -904,54 +920,31 @@ int CLUI_OnSkinLoad(WPARAM wParam, LPARAM lParam)
 	return 0;

 }

 

-static LPPROTOTICKS CLUI_GetProtoTicksByProto(char * szProto)

-{

-	int i;

-

-	for (i=0; i < 64; i++) {

-		if (CycleStartTick[i].szProto == NULL) break;

-		if (mir_strcmp(CycleStartTick[i].szProto,szProto)) continue;

-		return &CycleStartTick[i];

-	}

-

-	for (i=0; i < 64; i++) {

-		if (CycleStartTick[i].szProto == NULL) {

-			CycleStartTick[i].szProto = mir_strdup(szProto);

-			CycleStartTick[i].nCycleStartTick = 0;

-			CycleStartTick[i].nIndex = i;

-			CycleStartTick[i].bGlobal = ( szProto[0] == 0 );

-			CycleStartTick[i].himlIconList = NULL;

-			return &CycleStartTick[i];

-		}

-	}

-	return NULL;

-}

-

 static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)

 {

 	int count;

 	TCHAR fileFull[MAX_PATH];

 

-	if (!tszFolderPath[0] ) {

+	if (!tszFolderPath[0]) {

 		TCHAR szRelativePath[MAX_PATH];

-		GetModuleFileName( GetModuleHandle(NULL), szRelativePath, MAX_PATH);

-		TCHAR *str = _tcsrchr( szRelativePath, '\\' );

+		GetModuleFileName(GetModuleHandle(NULL), szRelativePath, MAX_PATH);

+		TCHAR *str = _tcsrchr(szRelativePath, '\\');

 		if (str != NULL)

 			*str = 0;

 		PathToAbsoluteT(szRelativePath, tszFolderPath);

 	}

 

-	if ( szAccoName ) {

+	if (szAccoName) {

 		// first of all try to find by account name( or empty - global )

-		mir_sntprintf(fileFull, SIZEOF(fileFull), _T("%s\\Icons\\proto_conn_%S.dll"), tszFolderPath, szAccoName );

+		mir_sntprintf(fileFull, SIZEOF(fileFull), _T("%s\\Icons\\proto_conn_%S.dll"), tszFolderPath, szAccoName);

 		if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 			return count;

 

-		if ( szAccoName[0] ) {

+		if (szAccoName[0]) {

 			// second try to find by protocol name

-			PROTOACCOUNT *acc = ProtoGetAccount( szAccoName );

+			PROTOACCOUNT *acc = ProtoGetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

-				mir_sntprintf(fileFull, SIZEOF(fileFull), _T("%s\\Icons\\proto_conn_%S.dll"), tszFolderPath, acc->szProtoName );

+				mir_sntprintf(fileFull, SIZEOF(fileFull), _T("%s\\Icons\\proto_conn_%S.dll"), tszFolderPath, acc->szProtoName);

 				if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 					return count;

 			}

@@ -959,7 +952,7 @@ static int CLUI_GetConnectingIconForProtoCount(char *szAccoName)
 	}

 

 	// third try global

-	mir_sntprintf(fileFull, SIZEOF(fileFull), _T("%s\\Icons\\proto_conn.dll"), tszFolderPath );

+	mir_sntprintf(fileFull, SIZEOF(fileFull), _T("%s\\Icons\\proto_conn.dll"), tszFolderPath);

 	if (count = ExtractIconEx(fileFull, -1, NULL, NULL, 1))

 		return count;

 

@@ -971,6 +964,8 @@ static HICON CLUI_LoadIconFromExternalFile(TCHAR *filename, int i)
 	TCHAR szPath[MAX_PATH], szFullPath[MAX_PATH];

 	mir_sntprintf(szPath, SIZEOF(szPath), _T("Icons\\%s"), filename);

 	PathToAbsoluteT(szPath, szFullPath);

+	if (_taccess(szPath, 0))

+		return NULL;

 

 	HICON hIcon = NULL;

 	ExtractIconEx(szFullPath, i, NULL, &hIcon, 1);

@@ -991,7 +986,7 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 			// second try to find by protocol name

 			PROTOACCOUNT *acc = ProtoGetAccount(szAccoName);

 			if (acc && !acc->bOldProto) {

-				mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("proto_conn_%S.dll"), acc->szProtoName );

+				mir_sntprintf(szFullPath, SIZEOF(szFullPath), _T("proto_conn_%S.dll"), acc->szProtoName);

 				if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 					return hIcon;

 			}

@@ -1003,69 +998,63 @@ static HICON CLUI_GetConnectingIconForProto(char *szAccoName, int idx)
 	if (hIcon = CLUI_LoadIconFromExternalFile(szFullPath, idx))

 		return hIcon;

 

-	return LoadSmallIcon(g_hInst, -IDI_ICQC1-idx);

+	return LoadSmallIcon(g_hInst, -IDI_ICQC1 - idx);

 }

 

-INT_PTR CLUI_GetConnectingIconService(WPARAM wParam, LPARAM lParam)

+static PROTOTICKS* CLUI_GetProtoTicksByProto(char *szProto)

 {

-	HICON hIcon = NULL;

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

+		if (!strcmp(arTicks[i].szProto, szProto))

+			return &arTicks[i];

 

-	char *szProto = (char *)wParam;

-	if (!szProto)

-		return 0;

+	PROTOTICKS *pt = new PROTOTICKS();

+	pt->szProto = mir_strdup(szProto);

+	pt->nCycleStartTick = 0;

+	pt->nIndex = arTicks.getCount();

+	pt->bGlobal = (szProto[0] == 0);

+	pt->himlIconList = NULL;

+	arTicks.insert(pt);

+	return pt;

+}

 

-	PROTOTICKS *pt = CLUI_GetProtoTicksByProto(szProto);

-	if (pt != NULL) {

-		if (pt->nCycleStartTick == 0) {

-			CLUI_CreateTimerForConnectingIcon(ID_STATUS_CONNECTING,wParam);

-			pt = CLUI_GetProtoTicksByProto(szProto);

-		}

-	}

-	if (pt != NULL) {

-		if (pt->nCycleStartTick != 0 && pt->nIconsCount != 0) {

-			int b = ((GetTickCount()-pt->nCycleStartTick)/(nAnimatedIconStep))%(pt->nIconsCount);

-			if (pt->himlIconList)

-				return (INT_PTR)ske_ImageList_GetIcon(pt->himlIconList,b,ILD_NORMAL);

+static bool StartTicksTimer(PROTOTICKS *pt)

+{

+	int cnt = CLUI_GetConnectingIconForProtoCount(pt->szProto);

+	if (cnt == 0)

+		return false;

+

+	pt->nIconsCount = cnt;

+	pt->himlIconList = ImageList_Create(16, 16, ILC_MASK | ILC_COLOR32, cnt, 1);

+	for (int i = 0; i < cnt; i++) {

+		HICON ic = CLUI_GetConnectingIconForProto(pt->szProto, i);

+		if (ic) {

+			ImageList_AddIcon(pt->himlIconList, ic);

+			DestroyIcon(ic);

 		}

 	}

-

-	return NULL;

+	CLUI_SafeSetTimer(pcli->hwndContactList, TM_STATUSBARUPDATE + pt->nIndex, (int)(nAnimatedIconStep) / 1, 0);

+	pt->bTimerCreated = 1;

+	pt->nCycleStartTick = GetTickCount();

+	return true;

 }

 

-static int CLUI_CreateTimerForConnectingIcon(WPARAM wParam, LPARAM lParam)

+INT_PTR CLUI_GetConnectingIconService(WPARAM wParam, LPARAM lParam)

 {

-	int status = (int)wParam;

-	char *szProto = (char*)lParam;

-	if (!szProto || !status)

+	char *szProto = (char*)wParam;

+	if (!szProto || !g_StatusBarData.bConnectingIcon)

 		return 0;

 

-	if (g_StatusBarData.bConnectingIcon && status >= ID_STATUS_CONNECTING && status <= ID_STATUS_CONNECTING+MAX_CONNECT_RETRIES) {

-		PROTOTICKS *pt = CLUI_GetProtoTicksByProto(szProto);

-		if (pt != NULL) {

-			if (pt->nCycleStartTick == 0) {

-				KillTimer(pcli->hwndContactList,TM_STATUSBARUPDATE+pt->nIndex);

-				int cnt = CLUI_GetConnectingIconForProtoCount(szProto);

-				if (cnt != 0) {

-					nAnimatedIconStep = 100;/*db_get_w(NULL,"CLUI","DefaultStepConnectingIcon",100);*/

-					pt->nIconsCount = cnt;

-					if (pt->himlIconList)

-						ImageList_Destroy(pt->himlIconList);

-					pt->himlIconList = ImageList_Create(16,16,ILC_MASK|ILC_COLOR32,cnt,1);

-					for (int i=0; i < cnt; i++) {

-						HICON ic = CLUI_GetConnectingIconForProto(szProto, i);

-						if (ic) {

-							ImageList_AddIcon(pt->himlIconList, ic);

-							DestroyIcon(ic);

-						}

-					}

-					CLUI_SafeSetTimer(pcli->hwndContactList,TM_STATUSBARUPDATE+pt->nIndex,(int)(nAnimatedIconStep)/1,0);

-					pt->bTimerCreated = 1;

-					pt->nCycleStartTick = GetTickCount();

-				}

-			}

-		}

+	PROTOTICKS *pt = CLUI_GetProtoTicksByProto(szProto);

+	if (pt->nCycleStartTick == 0)

+		StartTicksTimer(pt);

+

+	if (pt->nCycleStartTick != 0 && pt->nIconsCount != 0) {

+		int b = ((GetTickCount() - pt->nCycleStartTick) / (nAnimatedIconStep)) % (pt->nIconsCount);

+		if (pt->himlIconList)

+			return (INT_PTR)ske_ImageList_GetIcon(pt->himlIconList, b, ILD_NORMAL);

 	}

-	return 0;

+

+	return NULL;

 }

 

 static BOOL CALLBACK BroadcastEnumChildProc(HWND hwndChild, LPARAM lParam)

@@ -1078,26 +1067,26 @@ static BOOL CALLBACK BroadcastEnumChildProc(HWND hwndChild, LPARAM lParam)
 

 static LRESULT BroadCastMessageToChild(HWND hwnd, int message, WPARAM wParam, LPARAM lParam)

 {

-	MSG msg = {0};

+	MSG msg = { 0 };

 	msg.hwnd = hwnd;

 	msg.lParam = lParam;

 	msg.wParam = wParam;

 	msg.message = message;

-	EnumChildWindows(hwnd, BroadcastEnumChildProc, (LPARAM) &msg);

+	EnumChildWindows(hwnd, BroadcastEnumChildProc, (LPARAM)&msg);

 	return 1;

 }

 

 int CLUI_ReloadCLUIOptions()

 {

-	KillTimer(pcli->hwndContactList,TM_UPDATEBRINGTIMER);

+	KillTimer(pcli->hwndContactList, TM_UPDATEBRINGTIMER);

 	g_CluiData.bBehindEdgeSettings = db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT);

-	wBehindEdgeShowDelay = db_get_w(NULL,"ModernData","ShowDelay",SETTING_SHOWDELAY_DEFAULT);

-	wBehindEdgeHideDelay = db_get_w(NULL,"ModernData","HideDelay",SETTING_HIDEDELAY_DEFAULT);

-	wBehindEdgeBorderSize = db_get_w(NULL,"ModernData","HideBehindBorderSize",SETTING_HIDEBEHINDBORDERSIZE_DEFAULT);

+	wBehindEdgeShowDelay = db_get_w(NULL, "ModernData", "ShowDelay", SETTING_SHOWDELAY_DEFAULT);

+	wBehindEdgeHideDelay = db_get_w(NULL, "ModernData", "HideDelay", SETTING_HIDEDELAY_DEFAULT);

+	wBehindEdgeBorderSize = db_get_w(NULL, "ModernData", "HideBehindBorderSize", SETTING_HIDEBEHINDBORDERSIZE_DEFAULT);

 

-	g_CluiData.fAutoSize = db_get_b(NULL,"CLUI","AutoSize",SETTING_AUTOSIZE_DEFAULT);

-	g_CluiData.bInternalAwayMsgDiscovery = db_get_b(NULL,"ModernData","InternalAwayMsgDiscovery",SETTING_INTERNALAWAYMSGREQUEST_DEFAULT);

-	g_CluiData.bRemoveAwayMessageForOffline =  db_get_b(NULL,"ModernData","RemoveAwayMessageForOffline",SETTING_REMOVEAWAYMSGFOROFFLINE_DEFAULT);

+	g_CluiData.fAutoSize = db_get_b(NULL, "CLUI", "AutoSize", SETTING_AUTOSIZE_DEFAULT);

+	g_CluiData.bInternalAwayMsgDiscovery = db_get_b(NULL, "ModernData", "InternalAwayMsgDiscovery", SETTING_INTERNALAWAYMSGREQUEST_DEFAULT);

+	g_CluiData.bRemoveAwayMessageForOffline = db_get_b(NULL, "ModernData", "RemoveAwayMessageForOffline", SETTING_REMOVEAWAYMSGFOROFFLINE_DEFAULT);

 	//window borders

 	if (g_CluiData.fDisableSkinEngine) {

 		g_CluiData.LeftClientMargin = 0;

@@ -1107,10 +1096,10 @@ int CLUI_ReloadCLUIOptions()
 	}

 	else {

 		//window borders

-		g_CluiData.LeftClientMargin = (int)db_get_b(NULL,"CLUI","LeftClientMargin",SETTING_LEFTCLIENTMARIGN_DEFAULT);

-		g_CluiData.RightClientMargin = (int)db_get_b(NULL,"CLUI","RightClientMargin",SETTING_RIGHTCLIENTMARIGN_DEFAULT);

-		g_CluiData.TopClientMargin = (int)db_get_b(NULL,"CLUI","TopClientMargin",SETTING_TOPCLIENTMARIGN_DEFAULT);

-		g_CluiData.BottomClientMargin = (int)db_get_b(NULL,"CLUI","BottomClientMargin",SETTING_BOTTOMCLIENTMARIGN_DEFAULT);

+		g_CluiData.LeftClientMargin = (int)db_get_b(NULL, "CLUI", "LeftClientMargin", SETTING_LEFTCLIENTMARIGN_DEFAULT);

+		g_CluiData.RightClientMargin = (int)db_get_b(NULL, "CLUI", "RightClientMargin", SETTING_RIGHTCLIENTMARIGN_DEFAULT);

+		g_CluiData.TopClientMargin = (int)db_get_b(NULL, "CLUI", "TopClientMargin", SETTING_TOPCLIENTMARIGN_DEFAULT);

+		g_CluiData.BottomClientMargin = (int)db_get_b(NULL, "CLUI", "BottomClientMargin", SETTING_BOTTOMCLIENTMARIGN_DEFAULT);

 	}

 	BroadCastMessageToChild(pcli->hwndContactList, WM_THEMECHANGED, 0, 0);

 

@@ -1125,16 +1114,16 @@ void CLUI_DisconnectAll()
 	ProtoEnumAccounts(&nProtoCount, &accs);

 

 	for (int nProto = 0; nProto < nProtoCount; nProto++)

-		if ( IsAccountEnabled(accs[nProto]))

+		if (IsAccountEnabled(accs[nProto]))

 			CallProtoService(accs[nProto]->szModuleName, PS_SETSTATUS, ID_STATUS_OFFLINE, 0);

 }

 

 static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state)

 {

-	RECT ra,r1;

-	HRGN treg,treg2;

+	RECT ra, r1;

+	HRGN treg, treg2;

 

-	ClcData *dat = (ClcData*)GetWindowLongPtr(pcli->hwndContactTree,0);

+	ClcData *dat = (ClcData*)GetWindowLongPtr(pcli->hwndContactTree, 0);

 	if (!dat)

 		return 1;

 

@@ -1142,43 +1131,43 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state)
 

 	MENUBARINFO mbi = { sizeof(MENUBARINFO) };

 	GetMenuBarInfo(hwnd, OBJID_MENU, 0, &mbi);

-	if (!(mbi.rcBar.right-mbi.rcBar.left > 0 && mbi.rcBar.bottom-mbi.rcBar.top > 0))

+	if (!(mbi.rcBar.right - mbi.rcBar.left > 0 && mbi.rcBar.bottom - mbi.rcBar.top > 0))

 		return 1;

 

 	r1 = mbi.rcBar;

-	r1.bottom += !db_get_b(NULL,"CLUI","LineUnderMenu",SETTING_LINEUNDERMENU_DEFAULT);

+	r1.bottom += !db_get_b(NULL, "CLUI", "LineUnderMenu", SETTING_LINEUNDERMENU_DEFAULT);

 	if (item < 1) {

-		treg = CreateRectRgn(mbi.rcBar.left,mbi.rcBar.top,mbi.rcBar.right,r1.bottom);

+		treg = CreateRectRgn(mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, r1.bottom);

 		if (item == 0) { //should remove item clips

 			for (int t = 1; t <= 2; t++) {

 				GetMenuBarInfo(hwnd, OBJID_MENU, t, &mbi);

-				treg2 = CreateRectRgn(mbi.rcBar.left,mbi.rcBar.top,mbi.rcBar.right,mbi.rcBar.bottom);

-				CombineRgn(treg,treg,treg2,RGN_DIFF);

+				treg2 = CreateRectRgn(mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom);

+				CombineRgn(treg, treg, treg2, RGN_DIFF);

 				DeleteObject(treg2);

 			}

 		}

 	}

 	else {

 		GetMenuBarInfo(hwnd, OBJID_MENU, item, &mbi);

-		treg = CreateRectRgn(mbi.rcBar.left,mbi.rcBar.top,mbi.rcBar.right,mbi.rcBar.bottom+!db_get_b(NULL,"CLUI","LineUnderMenu",SETTING_LINEUNDERMENU_DEFAULT));

+		treg = CreateRectRgn(mbi.rcBar.left, mbi.rcBar.top, mbi.rcBar.right, mbi.rcBar.bottom + !db_get_b(NULL, "CLUI", "LineUnderMenu", SETTING_LINEUNDERMENU_DEFAULT));

 	}

-	OffsetRgn(treg,-ra.left,-ra.top);

+	OffsetRgn(treg, -ra.left, -ra.top);

 	r1.left -= ra.left;

 	r1.top -= ra.top;

 	r1.bottom -= ra.top;

 	r1.right -= ra.left;

 

-	SelectClipRgn(hdc,treg);

+	SelectClipRgn(hdc, treg);

 	DeleteObject(treg);

 

 	RECT rc;

 	GetWindowRect(pcli->hwndContactList, &rc);

-	OffsetRect(&rc,-rc.left, -rc.top);

+	OffsetRect(&rc, -rc.left, -rc.top);

 	FillRect(hdc, &r1, GetSysColorBrush(COLOR_MENU));

 	ske_SetRectOpaque(hdc, &r1);

 

 	if (!g_CluiData.fDisableSkinEngine)

-		SkinDrawGlyph(hdc,&r1,&r1,"Main,ID=MenuBar");

+		SkinDrawGlyph(hdc, &r1, &r1, "Main,ID=MenuBar");

 	else {

 		HBRUSH hbr = NULL;

 		if (dat->hMenuBackground) {

@@ -1190,48 +1179,48 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state)
 			BITMAP bmp;

 			GetObject(dat->hMenuBackground, sizeof(bmp), &bmp);

 			HDC hdcBmp = CreateCompatibleDC(hdc);

-			HBITMAP oldbm = (HBITMAP)SelectObject(hdcBmp,dat->hMenuBackground);

+			HBITMAP oldbm = (HBITMAP)SelectObject(hdcBmp, dat->hMenuBackground);

 			int y = clRect.top, x = clRect.left, destw, desth;

-			int maxx = (dat->MenuBmpUse & CLBF_TILEH) ? maxx = r1.right : x+1;

-			int maxy = (dat->MenuBmpUse & CLBF_TILEV) ? maxy = r1.bottom : y+1;

+			int maxx = (dat->MenuBmpUse & CLBF_TILEH) ? maxx = r1.right : x + 1;

+			int maxy = (dat->MenuBmpUse & CLBF_TILEV) ? maxy = r1.bottom : y + 1;

 

-			switch(dat->MenuBmpUse & CLBM_TYPE) {

+			switch (dat->MenuBmpUse & CLBM_TYPE) {

 			case CLB_STRETCH:

 				if (dat->MenuBmpUse & CLBF_PROPORTIONAL) {

-					if (clRect.right-clRect.left*bmp.bmHeight < clRect.bottom-clRect.top*bmp.bmWidth) {

-						desth = clRect.bottom-clRect.top;

-						destw = desth*bmp.bmWidth/bmp.bmHeight;

+					if (clRect.right - clRect.left*bmp.bmHeight < clRect.bottom - clRect.top*bmp.bmWidth) {

+						desth = clRect.bottom - clRect.top;

+						destw = desth*bmp.bmWidth / bmp.bmHeight;

 					}

 					else {

-						destw = clRect.right-clRect.left;

-						desth = destw*bmp.bmHeight/bmp.bmWidth;

+						destw = clRect.right - clRect.left;

+						desth = destw*bmp.bmHeight / bmp.bmWidth;

 					}

 				}

 				else {

-					destw = clRect.right-clRect.left;

-					desth = clRect.bottom-clRect.top;

+					destw = clRect.right - clRect.left;

+					desth = clRect.bottom - clRect.top;

 				}

 				break;

 

 			case CLB_STRETCHH:

 				if (dat->MenuBmpUse&CLBF_PROPORTIONAL) {

-					destw = clRect.right-clRect.left;

-					desth = destw*bmp.bmHeight/bmp.bmWidth;

+					destw = clRect.right - clRect.left;

+					desth = destw*bmp.bmHeight / bmp.bmWidth;

 				}

 				else {

-					destw = clRect.right-clRect.left;

+					destw = clRect.right - clRect.left;

 					desth = bmp.bmHeight;

 				}

 				break;

 

 			case CLB_STRETCHV:

 				if (dat->MenuBmpUse&CLBF_PROPORTIONAL) {

-					desth = clRect.bottom-clRect.top;

-					destw = desth*bmp.bmWidth/bmp.bmHeight;

+					desth = clRect.bottom - clRect.top;

+					destw = desth*bmp.bmWidth / bmp.bmHeight;

 				}

 				else {

 					destw = bmp.bmWidth;

-					desth = clRect.bottom-clRect.top;

+					desth = clRect.bottom - clRect.top;

 				}

 				break;

 

@@ -1250,45 +1239,45 @@ static int CLUI_DrawMenuBackGround(HWND hwnd, HDC hdc, int item, int state)
 		}

 		else {

 			hbr = CreateSolidBrush(dat->MenuBkColor);

-			FillRect(hdc,&r1,hbr);

+			FillRect(hdc, &r1, hbr);

 			DeleteObject(hbr);

 		}

 		if (item != 0 && state&(ODS_SELECTED)) {

 			hbr = CreateSolidBrush(dat->MenuBkHiColor);

-			FillRect(hdc,&r1,hbr);

+			FillRect(hdc, &r1, hbr);

 			DeleteObject(hbr);

 		}

 	}

 

-	SelectClipRgn(hdc,NULL);

+	SelectClipRgn(hdc, NULL);

 	return 0;

 }

 

-int CLUI_SizingGetWindowRect(HWND hwnd,RECT *rc)

+int CLUI_SizingGetWindowRect(HWND hwnd, RECT *rc)

 {

 	if (mutex_bDuringSizing && hwnd == pcli->hwndContactList)

 		*rc = rcSizingRect;

 	else

-		GetWindowRect(hwnd,rc);

+		GetWindowRect(hwnd, rc);

 	return 1;

 }

 

 

 int CLUI_SyncGetPDNCE(WPARAM wParam, LPARAM lParam)

 {

-	return CListSettings_GetCopyFromCache((ClcCacheEntry *)lParam, wParam ? (DWORD) wParam : CCI_ALL );

+	return CListSettings_GetCopyFromCache((ClcCacheEntry *)lParam, wParam ? (DWORD)wParam : CCI_ALL);

 }

 

 int CLUI_SyncSetPDNCE(WPARAM wParam, LPARAM lParam)

 {

-	return CListSettings_SetToCache((ClcCacheEntry *)lParam, wParam ?  (DWORD) wParam : CCI_ALL );

+	return CListSettings_SetToCache((ClcCacheEntry *)lParam, wParam ? (DWORD)wParam : CCI_ALL);

 }

 

 int CLUI_SyncGetShortData(WPARAM wParam, LPARAM lParam)

 {

-	HWND hwnd = (HWND) wParam;

-	ClcData *dat = (ClcData *)GetWindowLongPtr(hwnd,0);

-	return ClcGetShortData(dat,(struct SHORTDATA *)lParam);

+	HWND hwnd = (HWND)wParam;

+	ClcData *dat = (ClcData *)GetWindowLongPtr(hwnd, 0);

+	return ClcGetShortData(dat, (struct SHORTDATA *)lParam);

 }

 

 int CLUI_IconsChanged(WPARAM wParam, LPARAM lParam)

@@ -1310,12 +1299,12 @@ void CLUI_cli_LoadCluiGlobalOpts()
 	BOOL tLayeredFlag = TRUE;

 	tLayeredFlag &= db_get_b(NULL, "ModernData", "EnableLayering", tLayeredFlag);

 	if (tLayeredFlag) {

-		if ( db_get_b(NULL,"CList","WindowShadow",SETTING_WINDOWSHADOW_DEFAULT) == 1)

-			db_set_b(NULL,"CList","WindowShadow",2);

+		if (db_get_b(NULL, "CList", "WindowShadow", SETTING_WINDOWSHADOW_DEFAULT) == 1)

+			db_set_b(NULL, "CList", "WindowShadow", 2);

 	}

 	else {

-		if ( db_get_b(NULL,"CList","WindowShadow",SETTING_WINDOWSHADOW_DEFAULT) == 2)

-			db_set_b(NULL,"CList","WindowShadow",1);

+		if (db_get_b(NULL, "CList", "WindowShadow", SETTING_WINDOWSHADOW_DEFAULT) == 2)

+			db_set_b(NULL, "CList", "WindowShadow", 1);

 	}

 	corecli.pfnLoadCluiGlobalOpts();

 }

@@ -1327,7 +1316,7 @@ int CLUI_TestCursorOnBorders()
 	HCURSOR hCurs1 = NULL;

 	RECT r;

 	POINT pt;

-	int k = 0, t = 0, fx,fy;

+	int k = 0, t = 0, fx, fy;

 	HWND hAux;

 	BOOL mouse_in_window = 0;

 	HWND gf = GetForegroundWindow();

@@ -1336,22 +1325,22 @@ int CLUI_TestCursorOnBorders()
 	if (CLUI_CheckOwnedByClui(hAux)) {

 		if (g_bTransparentFlag) {

 			if (!bTransparentFocus && gf != hwnd) {

-				CLUI_SmoothAlphaTransition(hwnd, db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), 1);

+				CLUI_SmoothAlphaTransition(hwnd, db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT), 1);

 				bTransparentFocus = 1;

-				CLUI_SafeSetTimer(hwnd, TM_AUTOALPHA,250, NULL);

+				CLUI_SafeSetTimer(hwnd, TM_AUTOALPHA, 250, NULL);

 			}

 		}

 	}

 

 	mutex_bIgnoreActivation = 0;

-	GetWindowRect(hwnd,&r);

+	GetWindowRect(hwnd, &r);

 	/*

 	*  Size borders offset (contract)

 	*/

-	r.top += db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Top",SKIN_OFFSET_TOP_DEFAULT);

-	r.bottom -= db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Bottom",SKIN_OFFSET_BOTTOM_DEFAULT);

-	r.left += db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Left",SKIN_OFFSET_LEFT_DEFAULT);

-	r.right -= db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Right",SKIN_OFFSET_RIGHT_DEFAULT);

+	r.top += db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Top", SKIN_OFFSET_TOP_DEFAULT);

+	r.bottom -= db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Bottom", SKIN_OFFSET_BOTTOM_DEFAULT);

+	r.left += db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Left", SKIN_OFFSET_LEFT_DEFAULT);

+	r.right -= db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Right", SKIN_OFFSET_RIGHT_DEFAULT);

 

 	if (r.right < r.left) r.right = r.left;

 	if (r.bottom < r.top) r.bottom = r.top;

@@ -1361,9 +1350,8 @@ int CLUI_TestCursorOnBorders()
 	*/

 

 	hAux = WindowFromPoint(pt);

-	while(hAux != NULL)

-	{

-		if (hAux == hwnd) {mouse_in_window = 1; break;}

+	while (hAux != NULL) {

+		if (hAux == hwnd) { mouse_in_window = 1; break; }

 		hAux = GetParent(hAux);

 	}

 	fx = GetSystemMetrics(SM_CXFULLSCREEN);

@@ -1373,25 +1361,24 @@ int CLUI_TestCursorOnBorders()
 	{

 		//ScreenToClient(hwnd,&pt);

 		//GetClientRect(hwnd,&r);

-		if (pt.y <= r.bottom && pt.y >= r.bottom-SIZING_MARGIN && !g_CluiData.fAutoSize) k = 6;

-		else if (pt.y >= r.top && pt.y <= r.top+SIZING_MARGIN && !g_CluiData.fAutoSize) k = 3;

-		if (pt.x <= r.right && pt.x >= r.right-SIZING_MARGIN && g_CluiData.bBehindEdgeSettings != 2) k += 2;

-		else if (pt.x >= r.left && pt.x <= r.left+SIZING_MARGIN && g_CluiData.bBehindEdgeSettings != 1) k += 1;

+		if (pt.y <= r.bottom && pt.y >= r.bottom - SIZING_MARGIN && !g_CluiData.fAutoSize) k = 6;

+		else if (pt.y >= r.top && pt.y <= r.top + SIZING_MARGIN && !g_CluiData.fAutoSize) k = 3;

+		if (pt.x <= r.right && pt.x >= r.right - SIZING_MARGIN && g_CluiData.bBehindEdgeSettings != 2) k += 2;

+		else if (pt.x >= r.left && pt.x <= r.left + SIZING_MARGIN && g_CluiData.bBehindEdgeSettings != 1) k += 1;

 		if (!(pt.x >= r.left && pt.x <= r.right && pt.y >= r.top && pt.y <= r.bottom)) k = 0;

 		k *= mouse_in_window;

 		hCurs1 = LoadCursor(NULL, IDC_ARROW);

-		if (g_CluiData.nBehindEdgeState <= 0 && (!( db_get_b(NULL,"CLUI","LockSize",SETTING_LOCKSIZE_DEFAULT))))

-			switch(k)

-		{

+		if (g_CluiData.nBehindEdgeState <= 0 && (!(db_get_b(NULL, "CLUI", "LockSize", SETTING_LOCKSIZE_DEFAULT))))

+			switch (k) {

 			case 1:

 			case 2:

-				if (!g_CluiData.fDocked || (g_CluiData.fDocked == 2 && k == 1) || (g_CluiData.fDocked == 1 && k == 2)){hCurs1 = LoadCursor(NULL, IDC_SIZEWE); break;}

-			case 3: if (!g_CluiData.fDocked) {hCurs1 = LoadCursor(NULL, IDC_SIZENS); break;}

-			case 4: if (!g_CluiData.fDocked) {hCurs1 = LoadCursor(NULL, IDC_SIZENWSE); break;}

-			case 5: if (!g_CluiData.fDocked) {hCurs1 = LoadCursor(NULL, IDC_SIZENESW); break;}

-			case 6: if (!g_CluiData.fDocked) {hCurs1 = LoadCursor(NULL, IDC_SIZENS); break;}

-			case 7: if (!g_CluiData.fDocked) {hCurs1 = LoadCursor(NULL, IDC_SIZENESW); break;}

-			case 8: if (!g_CluiData.fDocked) {hCurs1 = LoadCursor(NULL, IDC_SIZENWSE); break;}

+				if (!g_CluiData.fDocked || (g_CluiData.fDocked == 2 && k == 1) || (g_CluiData.fDocked == 1 && k == 2)) { hCurs1 = LoadCursor(NULL, IDC_SIZEWE); break; }

+			case 3: if (!g_CluiData.fDocked) { hCurs1 = LoadCursor(NULL, IDC_SIZENS); break; }

+			case 4: if (!g_CluiData.fDocked) { hCurs1 = LoadCursor(NULL, IDC_SIZENWSE); break; }

+			case 5: if (!g_CluiData.fDocked) { hCurs1 = LoadCursor(NULL, IDC_SIZENESW); break; }

+			case 6: if (!g_CluiData.fDocked) { hCurs1 = LoadCursor(NULL, IDC_SIZENS); break; }

+			case 7: if (!g_CluiData.fDocked) { hCurs1 = LoadCursor(NULL, IDC_SIZENESW); break; }

+			case 8: if (!g_CluiData.fDocked) { hCurs1 = LoadCursor(NULL, IDC_SIZENWSE); break; }

 		}

 		if (hCurs1) SetCursor(hCurs1);

 		return k;

@@ -1402,19 +1389,18 @@ int CLUI_TestCursorOnBorders()
 

 int CLUI_SizingOnBorder(POINT pt, int PerformSize)

 {

-	if (!( db_get_b(NULL,"CLUI","LockSize",SETTING_LOCKSIZE_DEFAULT)))

-	{

+	if (!(db_get_b(NULL, "CLUI", "LockSize", SETTING_LOCKSIZE_DEFAULT))) {

 		RECT r;

 		HWND hwnd = pcli->hwndContactList;

 		int sizeOnBorderFlag = 0;

-		GetWindowRect(hwnd,&r);

+		GetWindowRect(hwnd, &r);

 		/*

 		*  Size borders offset (contract)

 		*/

-		r.top += db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Top",SKIN_OFFSET_TOP_DEFAULT);

-		r.bottom -= db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Bottom",SKIN_OFFSET_BOTTOM_DEFAULT);

-		r.left += db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Left",SKIN_OFFSET_LEFT_DEFAULT);

-		r.right -= db_get_dw(NULL,"ModernSkin","SizeMarginOffset_Right",SKIN_OFFSET_RIGHT_DEFAULT);

+		r.top += db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Top", SKIN_OFFSET_TOP_DEFAULT);

+		r.bottom -= db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Bottom", SKIN_OFFSET_BOTTOM_DEFAULT);

+		r.left += db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Left", SKIN_OFFSET_LEFT_DEFAULT);

+		r.right -= db_get_dw(NULL, "ModernSkin", "SizeMarginOffset_Right", SKIN_OFFSET_RIGHT_DEFAULT);

 

 		if (r.right < r.left) r.right = r.left;

 		if (r.bottom < r.top) r.bottom = r.top;

@@ -1422,21 +1408,19 @@ int CLUI_SizingOnBorder(POINT pt, int PerformSize)
 		/*

 		*  End of size borders offset (contract)

 		*/

-		if (!g_CluiData.fAutoSize )

-		{

-			if      ( pt.y <= r.bottom && pt.y >= r.bottom - SIZING_MARGIN )    sizeOnBorderFlag  = SCF_BOTTOM;

-			else if ( pt.y >= r.top    && pt.y <= r.top + SIZING_MARGIN )       sizeOnBorderFlag  = SCF_TOP;

+		if (!g_CluiData.fAutoSize) {

+			if (pt.y <= r.bottom && pt.y >= r.bottom - SIZING_MARGIN)    sizeOnBorderFlag = SCF_BOTTOM;

+			else if (pt.y >= r.top    && pt.y <= r.top + SIZING_MARGIN)       sizeOnBorderFlag = SCF_TOP;

 		}

 

-		if ( pt.x <= r.right && pt.x >= r.right - SIZING_MARGIN )               sizeOnBorderFlag += SCF_RIGHT;

-		else if ( pt.x >= r.left && pt.x <= r.left + SIZING_MARGIN )            sizeOnBorderFlag += SCF_LEFT;

+		if (pt.x <= r.right && pt.x >= r.right - SIZING_MARGIN)               sizeOnBorderFlag += SCF_RIGHT;

+		else if (pt.x >= r.left && pt.x <= r.left + SIZING_MARGIN)            sizeOnBorderFlag += SCF_LEFT;

 

-		if (!(pt.x >= r.left && pt.x <= r.right && pt.y >= r.top && pt.y <= r.bottom))  sizeOnBorderFlag  = SCF_NONE;

+		if (!(pt.x >= r.left && pt.x <= r.right && pt.y >= r.top && pt.y <= r.bottom))  sizeOnBorderFlag = SCF_NONE;

 

-		if (sizeOnBorderFlag && PerformSize)

-		{

+		if (sizeOnBorderFlag && PerformSize) {

 			ReleaseCapture();

-			SendMessage(hwnd, WM_SYSCOMMAND, SC_SIZE + sizeOnBorderFlag,MAKELPARAM(pt.x,pt.y));

+			SendMessage(hwnd, WM_SYSCOMMAND, SC_SIZE + sizeOnBorderFlag, MAKELPARAM(pt.x, pt.y));

 			return sizeOnBorderFlag;

 		}

 		else return sizeOnBorderFlag;

@@ -1456,17 +1440,16 @@ static void CLUI_SmoothAnimationThreadProc(void *param)
 	if (mutex_bAnimationInProgress) {

 		do {

 			if (!g_mutex_bLockUpdating) {

-				if ( MirandaExiting())

+				if (MirandaExiting())

 					return;

 

 				Sync(CLUI_SyncSmoothAnimation, 0, (LPARAM)param);

 				SleepEx(20, TRUE);

-				if ( MirandaExiting())

+				if (MirandaExiting())

 					return;

 			}

 			else SleepEx(0, TRUE);

-		}

-			while (mutex_bAnimationInProgress);

+		} while (mutex_bAnimationInProgress);

 	}

 }

 

@@ -1475,22 +1458,20 @@ static int CLUI_SmoothAlphaThreadTransition(HWND hwnd)
 	int step;

 	int a;

 

-	step = (g_CluiData.bCurrentAlpha>bAlphaEnd)?-1*ANIMATION_STEP:ANIMATION_STEP;

-	a = g_CluiData.bCurrentAlpha+step;

-	if ((step >= 0 && a >= bAlphaEnd) || (step <= 0 && a <= bAlphaEnd))

-	{

+	step = (g_CluiData.bCurrentAlpha > bAlphaEnd) ? -1 * ANIMATION_STEP : ANIMATION_STEP;

+	a = g_CluiData.bCurrentAlpha + step;

+	if ((step >= 0 && a >= bAlphaEnd) || (step <= 0 && a <= bAlphaEnd)) {

 		mutex_bAnimationInProgress = 0;

 		g_CluiData.bCurrentAlpha = bAlphaEnd;

-		if (g_CluiData.bCurrentAlpha == 0)

-		{

+		if (g_CluiData.bCurrentAlpha == 0) {

 			g_CluiData.bCurrentAlpha = 1;

 			ske_JustUpdateWindowImage();

 			mutex_bShowHideCalledFromAnimation = 1;

-			CLUI_ShowWindowMod(pcli->hwndContactList,0);

-			Sync(CLUIFrames_OnShowHide, hwnd,0);

+			CLUI_ShowWindowMod(pcli->hwndContactList, 0);

+			Sync(CLUIFrames_OnShowHide, hwnd, 0);

 			mutex_bShowHideCalledFromAnimation = 0;

 			g_CluiData.bCurrentAlpha = 0;

-			if (!g_CluiData.fLayered) RedrawWindow(pcli->hwndContactList,NULL,NULL,RDW_ERASE|RDW_FRAME);

+			if (!g_CluiData.fLayered) RedrawWindow(pcli->hwndContactList, NULL, NULL, RDW_ERASE | RDW_FRAME);

 			return 0;

 		}

 	}

@@ -1503,28 +1484,23 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam)
 {

 

 	if (!g_CluiData.fLayered

-		 &&  (!g_CluiData.fSmoothAnimation && !g_bTransparentFlag))

-	{

-		if (GoalAlpha>0 && wParam != 2)

-		{

-			if (!IsWindowVisible(hwnd))

-			{

+		&& (!g_CluiData.fSmoothAnimation && !g_bTransparentFlag)) {

+		if (GoalAlpha > 0 && wParam != 2) {

+			if (!IsWindowVisible(hwnd)) {

 				mutex_bShowHideCalledFromAnimation = 1;

-				CLUI_ShowWindowMod(pcli->hwndContactList,SW_RESTORE);

-				Sync(CLUIFrames_OnShowHide, hwnd,1);

+				CLUI_ShowWindowMod(pcli->hwndContactList, SW_RESTORE);

+				Sync(CLUIFrames_OnShowHide, hwnd, 1);

 				mutex_bShowHideCalledFromAnimation = 0;

 				g_CluiData.bCurrentAlpha = GoalAlpha;

 				ske_UpdateWindowImage();

 

 			}

 		}

-		else if (GoalAlpha == 0 && wParam != 2)

-		{

-			if (IsWindowVisible(hwnd))

-			{

+		else if (GoalAlpha == 0 && wParam != 2) {

+			if (IsWindowVisible(hwnd)) {

 				mutex_bShowHideCalledFromAnimation = 1;

-				CLUI_ShowWindowMod(pcli->hwndContactList,0);

-				Sync(CLUIFrames_OnShowHide, hwnd,0);

+				CLUI_ShowWindowMod(pcli->hwndContactList, 0);

+				Sync(CLUIFrames_OnShowHide, hwnd, 0);

 				g_CluiData.bCurrentAlpha = GoalAlpha;

 				mutex_bShowHideCalledFromAnimation = 0;

 

@@ -1540,8 +1516,8 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam)
 		if (!mutex_bAnimationInProgress) {

 			if ((!IsWindowVisible(hwnd) || g_CluiData.bCurrentAlpha == 0) && bAlphaEnd > 0) {

 				mutex_bShowHideCalledFromAnimation = 1;

-				CLUI_ShowWindowMod(pcli->hwndContactList,SW_SHOWNA);

-				Sync(CLUIFrames_OnShowHide, hwnd,SW_SHOW);

+				CLUI_ShowWindowMod(pcli->hwndContactList, SW_SHOWNA);

+				Sync(CLUIFrames_OnShowHide, hwnd, SW_SHOW);

 				mutex_bShowHideCalledFromAnimation = 0;

 				g_CluiData.bCurrentAlpha = 1;

 				ske_UpdateWindowImage();

@@ -1554,17 +1530,17 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam)
 		}

 	}

 

-	int step = (g_CluiData.bCurrentAlpha>bAlphaEnd) ? -1*ANIMATION_STEP : ANIMATION_STEP;

-	int a = g_CluiData.bCurrentAlpha+step;

+	int step = (g_CluiData.bCurrentAlpha > bAlphaEnd) ? -1 * ANIMATION_STEP : ANIMATION_STEP;

+	int a = g_CluiData.bCurrentAlpha + step;

 	if ((step >= 0 && a >= bAlphaEnd) || (step <= 0 && a <= bAlphaEnd) || g_CluiData.bCurrentAlpha == bAlphaEnd || !g_CluiData.fSmoothAnimation) { //stop animation;

-		KillTimer(hwnd,TM_SMOTHALPHATRANSITION);

+		KillTimer(hwnd, TM_SMOTHALPHATRANSITION);

 		mutex_bAnimationInProgress = 0;

 		if (bAlphaEnd == 0) {

 			g_CluiData.bCurrentAlpha = 1;

 			ske_UpdateWindowImage();

 			mutex_bShowHideCalledFromAnimation = 1;

-			CLUI_ShowWindowMod(pcli->hwndContactList,0);

-			Sync(CLUIFrames_OnShowHide, pcli->hwndContactList,0);

+			CLUI_ShowWindowMod(pcli->hwndContactList, 0);

+			Sync(CLUIFrames_OnShowHide, pcli->hwndContactList, 0);

 			mutex_bShowHideCalledFromAnimation = 0;

 			g_CluiData.bCurrentAlpha = 0;

 		}

@@ -1583,7 +1559,7 @@ int CLUI_SmoothAlphaTransition(HWND hwnd, BYTE GoalAlpha, BOOL wParam)
 

 BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase)

 {

-	if ( CLUI_IsInMainWindow(hWnd) && g_CluiData.fLayered) {

+	if (CLUI_IsInMainWindow(hWnd) && g_CluiData.fLayered) {

 		if (IsWindowVisible(hWnd))

 			return SkinInvalidateFrame(hWnd, lpRect);

 

@@ -1591,24 +1567,24 @@ BOOL CLUI__cliInvalidateRect(HWND hWnd, CONST RECT* lpRect, BOOL bErase)
 		return 0;

 	}

 

-	return InvalidateRect(hWnd,lpRect,bErase);

+	return InvalidateRect(hWnd, lpRect, bErase);

 }

 

 static BOOL FileExists(TCHAR * tszFilename)

 {

 	BOOL result = FALSE;

-	FILE * f = _tfopen(tszFilename,_T("r"));

+	FILE * f = _tfopen(tszFilename, _T("r"));

 	if (f == NULL) return FALSE;

 	fclose(f);

 	return TRUE;

 }

 

-HANDLE RegisterIcolibIconHandle(char *szIcoID, char *szSectionName,  char *szDescription, TCHAR *tszDefaultFile, int iDefaultIndex, HINSTANCE hDefaultModuleInst, int iDefaultResource )

+HANDLE RegisterIcolibIconHandle(char *szIcoID, char *szSectionName, char *szDescription, TCHAR *tszDefaultFile, int iDefaultIndex, HINSTANCE hDefaultModuleInst, int iDefaultResource)

 {

 	if (hDefaultModuleInst == NULL)

 		return LoadSkinnedIconHandle(iDefaultResource);

 

-	TCHAR fileFull[MAX_PATH] = {0};

+	TCHAR fileFull[MAX_PATH] = { 0 };

 

 	SKINICONDESC sid = { sizeof(sid) };

 	sid.cx = sid.cy = 16;

@@ -1635,12 +1611,11 @@ HANDLE RegisterIcolibIconHandle(char *szIcoID, char *szSectionName,  char *szDes
 }

 

 // MAIN WINPROC MESSAGE HANDLERS

-LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bHandled )

+LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bHandled)

 {

 	// proxy CLUI Messages

 	LRESULT result = 0;

-	if ( ProcessCLUIFrameInternalMsg( m_hWnd, msg, wParam, lParam, result ))

-	{

+	if (ProcessCLUIFrameInternalMsg(m_hWnd, msg, wParam, lParam, result)) {

 		bHandled = TRUE;

 		return result;

 	}

@@ -1652,8 +1627,7 @@ LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bH
 

 	The caller is expected to create this mapping object and tell us the ID we need to open ours.

 	*/

-	if (g_CluiData.bSTATE == STATE_EXITING && msg != WM_DESTROY)

-	{

+	if (g_CluiData.bSTATE == STATE_EXITING && msg != WM_DESTROY) {

 		bHandled = TRUE;

 		return 0;

 	}

@@ -1662,22 +1636,20 @@ LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bH
 		HANDLE hMap;

 		char szName[MAX_PATH];

 		int rc = 0;

-		mir_snprintf( szName, SIZEOF(szName), "Miranda::%u", wParam ); // caller will tell us the ID of the map

-		hMap = OpenFileMappingA( FILE_MAP_ALL_ACCESS,FALSE, szName );

-		if ( hMap != NULL )

-		{

+		mir_snprintf(szName, SIZEOF(szName), "Miranda::%u", wParam); // caller will tell us the ID of the map

+		hMap = OpenFileMappingA(FILE_MAP_ALL_ACCESS, FALSE, szName);

+		if (hMap != NULL) {

 			void *hView = NULL;

-			hView   = MapViewOfFile( hMap, FILE_MAP_ALL_ACCESS, 0, 0, MAX_PATH );

-			if (hView)

-			{

+			hView = MapViewOfFile(hMap, FILE_MAP_ALL_ACCESS, 0, 0, MAX_PATH);

+			if (hView) {

 				char szFilePath[MAX_PATH], szProfile[MAX_PATH];

-				CallService(MS_DB_GETPROFILEPATH,MAX_PATH,(LPARAM)&szFilePath );

-				CallService(MS_DB_GETPROFILENAME,MAX_PATH,(LPARAM)&szProfile );

-				mir_snprintf((char*)hView, MAX_PATH, "%s\\%s", szFilePath, szProfile );

-				UnmapViewOfFile( hView );

+				CallService(MS_DB_GETPROFILEPATH, MAX_PATH, (LPARAM)&szFilePath);

+				CallService(MS_DB_GETPROFILENAME, MAX_PATH, (LPARAM)&szProfile);

+				mir_snprintf((char*)hView, MAX_PATH, "%s\\%s", szFilePath, szProfile);

+				UnmapViewOfFile(hView);

 				rc = 1;

 			}

-			CloseHandle( hMap );

+			CloseHandle(hMap);

 		}

 		bHandled = TRUE;

 		return rc;

@@ -1688,14 +1660,11 @@ LRESULT CLUI::PreProcessWndProc(UINT msg, WPARAM wParam, LPARAM lParam, BOOL& bH
 

 LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	if (g_CluiData.fLayered)

-	{

-		if (msg == WM_SIZING)

-		{

+	if (g_CluiData.fLayered) {

+		if (msg == WM_SIZING) {

 			static int a = 0;

 			RECT* wp = (RECT*)lParam;

-			if (bNeedFixSizingRect && (rcCorrectSizeRect.bottom != 0 || rcCorrectSizeRect.top != 0))

-			{

+			if (bNeedFixSizingRect && (rcCorrectSizeRect.bottom != 0 || rcCorrectSizeRect.top != 0)) {

 				if (wParam != WMSZ_BOTTOM) wp->bottom = rcCorrectSizeRect.bottom;

 				if (wParam != WMSZ_TOP) wp->top = rcCorrectSizeRect.top;

 			}

@@ -1705,86 +1674,69 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam)
 			return 1;

 		}

 

-		if (msg == WM_WINDOWPOSCHANGING)

-		{

-

-

-			WINDOWPOS * wp;

-			HDWP PosBatch;

-			RECT work_rect = {0};

-			RECT temp_rect = {0};

-			wp = (WINDOWPOS *)lParam;

-			GetWindowRect(m_hWnd,&rcOldWindowRect);

+		if (msg == WM_WINDOWPOSCHANGING) {

+			RECT work_rect = { 0 };

+			RECT temp_rect = { 0 };

+			WINDOWPOS *wp = (WINDOWPOS*)lParam;

+			GetWindowRect(m_hWnd, &rcOldWindowRect);

 

 			// Ïðèëèïàíèå ê êðàÿì by ZorG

 			CLUI::SnappingToEdge(wp);

 

-			if ((rcOldWindowRect.bottom-rcOldWindowRect.top != wp->cy || rcOldWindowRect.right-rcOldWindowRect.left != wp->cx) && !(wp->flags&SWP_NOSIZE))

-			{

-				{

-					if (!(wp->flags&SWP_NOMOVE))

-					{

-						rcNewWindowRect.left = wp->x;

-						rcNewWindowRect.top = wp->y;

-					}

-					else

-					{

-						rcNewWindowRect.left = rcOldWindowRect.left;

-						rcNewWindowRect.top = rcOldWindowRect.top;

-					}

-					rcNewWindowRect.right = rcNewWindowRect.left+wp->cx;

-					rcNewWindowRect.bottom = rcNewWindowRect.top+wp->cy;

-					work_rect = rcNewWindowRect;

+			if ((rcOldWindowRect.bottom - rcOldWindowRect.top != wp->cy || rcOldWindowRect.right - rcOldWindowRect.left != wp->cx) && !(wp->flags&SWP_NOSIZE)) {

+				if (!(wp->flags&SWP_NOMOVE)) {

+					rcNewWindowRect.left = wp->x;

+					rcNewWindowRect.top = wp->y;

 				}

-				//resize frames (batch)

-				{

-					PosBatch = BeginDeferWindowPos(1);

-					SizeFramesByWindowRect(&work_rect,&PosBatch,0);

-				}

-				//Check rect after frames resize

-				{

-					GetWindowRect(m_hWnd,&temp_rect);

+				else {

+					rcNewWindowRect.left = rcOldWindowRect.left;

+					rcNewWindowRect.top = rcOldWindowRect.top;

 				}

-				//Here work_rect should be changed to fit possible changes in cln_listsizechange

-				if (bNeedFixSizingRect)

-				{

+				rcNewWindowRect.right = rcNewWindowRect.left + wp->cx;

+				rcNewWindowRect.bottom = rcNewWindowRect.top + wp->cy;

+				work_rect = rcNewWindowRect;

+

+				// resize frames (batch)

+				HDWP PosBatch = BeginDeferWindowPos(1);

+				SizeFramesByWindowRect(&work_rect, &PosBatch, 0);

+

+				// Check rect after frames resize

+				GetWindowRect(m_hWnd, &temp_rect);

+

+				// Here work_rect should be changed to fit possible changes in cln_listsizechange

+				if (bNeedFixSizingRect) {

 					work_rect = rcSizingRect;

 					wp->x = work_rect.left;

 					wp->y = work_rect.top;

-					wp->cx = work_rect.right-work_rect.left;

-					wp->cy = work_rect.bottom-work_rect.top;

+					wp->cx = work_rect.right - work_rect.left;

+					wp->cy = work_rect.bottom - work_rect.top;

 					wp->flags &= ~(SWP_NOMOVE);

 				}

-				//reposition buttons and new size applying

-				{

-					ModernSkinButton_ReposButtons( m_hWnd, SBRF_DO_NOT_DRAW, &work_rect );

-					ske_PrepareImageButDontUpdateIt(&work_rect);

-					g_CluiData.mutexPreventDockMoving = 0;

-					ske_UpdateWindowImageRect(&work_rect);

-					EndDeferWindowPos(PosBatch);

-					g_CluiData.mutexPreventDockMoving = 1;

-				}

+				// reposition buttons and new size applying

+				ModernSkinButton_ReposButtons(m_hWnd, SBRF_DO_NOT_DRAW, &work_rect);

+				ske_PrepareImageButDontUpdateIt(&work_rect);

+				g_CluiData.mutexPreventDockMoving = 0;

+				ske_UpdateWindowImageRect(&work_rect);

+				EndDeferWindowPos(PosBatch);

+				g_CluiData.mutexPreventDockMoving = 1;

+

 				Sleep(0);

 				mutex_bDuringSizing = 0;

-				DefWindowProc(m_hWnd,msg,wParam,lParam);

-				return SendMessage(m_hWnd,WM_WINDOWPOSCHANGED,wParam,lParam);

-			}

-			else

-			{

-				SetRect(&rcCorrectSizeRect, 0, 0, 0, 0);

-				// bNeedFixSizingRect = 0;

+				DefWindowProc(m_hWnd, msg, wParam, lParam);

+				return SendMessage(m_hWnd, WM_WINDOWPOSCHANGED, wParam, lParam);

 			}

-			return DefWindowProc(m_hWnd,msg,wParam,lParam);

+			else SetRect(&rcCorrectSizeRect, 0, 0, 0, 0);

+

+			return DefWindowProc(m_hWnd, msg, wParam, lParam);

 		}

 	}

 

-	else if (msg == WM_WINDOWPOSCHANGING)

-	{

+	else if (msg == WM_WINDOWPOSCHANGING) {

 		// Snaping if it is not in LayeredMode

 		WINDOWPOS * wp;

 		wp = (WINDOWPOS *)lParam;

-		CLUI::SnappingToEdge( wp );

-		return DefWindowProc(m_hWnd,msg,wParam,lParam);

+		CLUI::SnappingToEdge(wp);

+		return DefWindowProc(m_hWnd, msg, wParam, lParam);

 	}

 	switch (msg) {

 	case WM_DISPLAYCHANGE:

@@ -1810,127 +1762,117 @@ LRESULT CLUI::OnSizingMoving(UINT msg, WPARAM wParam, LPARAM lParam)
 			mutex_bDuringSizing = 0;

 			GetWindowRect(m_hWnd, &rc);

 			CheckFramesPos(&rc);

-			Sync(CLUIFrames_OnMoving,m_hWnd,&rc);

+			Sync(CLUIFrames_OnMoving, m_hWnd, &rc);

 			if (!IsIconic(m_hWnd)) {

-				if (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0))

-				{ //if g_CluiData.fDocked, dont remember pos (except for width)

-					db_set_dw(NULL,"CList","Height",(DWORD)(rc.bottom - rc.top));

-					db_set_dw(NULL,"CList","x",(DWORD)rc.left);

-					db_set_dw(NULL,"CList","y",(DWORD)rc.top);

+				if (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0)) { //if g_CluiData.fDocked, dont remember pos (except for width)

+					db_set_dw(NULL, "CList", "Height", (DWORD)(rc.bottom - rc.top));

+					db_set_dw(NULL, "CList", "x", (DWORD)rc.left);

+					db_set_dw(NULL, "CList", "y", (DWORD)rc.top);

 				}

-				db_set_dw(NULL,"CList","Width",(DWORD)(rc.right - rc.left));

+				db_set_dw(NULL, "CList", "Width", (DWORD)(rc.right - rc.left));

 			}

-			return TRUE;

 		}

+		return TRUE;

 	case WM_SIZE:

-		{

+		if (g_mutex_bSizing) return 0;

+		if (wParam != SIZE_MINIMIZED /* &&  IsWindowVisible(m_hWnd)*/) {

+			if (pcli->hwndContactList == NULL)

+				return 0;

+

+			if (!g_CluiData.fLayered && !g_CluiData.fDisableSkinEngine)

+				ske_ReCreateBackImage(TRUE, NULL);

+

 			RECT rc;

-			if (g_mutex_bSizing) return 0;

-			if (wParam != SIZE_MINIMIZED /* &&  IsWindowVisible(m_hWnd)*/)

-			{

-				if ( pcli->hwndContactList == NULL )

-					return 0;

-

-				if (!g_CluiData.fLayered && !g_CluiData.fDisableSkinEngine)

-					ske_ReCreateBackImage(TRUE,NULL);

-

-				GetWindowRect(m_hWnd, &rc);

-				CheckFramesPos(&rc);

-				ModernSkinButton_ReposButtons( m_hWnd, SBRF_DO_NOT_DRAW, &rc);

-				ModernSkinButton_ReposButtons( m_hWnd, SBRF_REDRAW, NULL);

-				if (g_CluiData.fLayered)

-					CallService(MS_SKINENG_UPTATEFRAMEIMAGE,(WPARAM)m_hWnd,0);

-

-				if (!g_CluiData.fLayered)

-				{

-					g_mutex_bSizing = 1;

-					Sync(CLUIFrames_OnClistResize_mod,(WPARAM)m_hWnd,1);

-					CLUIFrames_ApplyNewSizes(2);

-					CLUIFrames_ApplyNewSizes(1);

-					SendMessage(m_hWnd,CLN_LISTSIZECHANGE, 0, 0);

-					g_mutex_bSizing = 0;

-				}

+			GetWindowRect(m_hWnd, &rc);

+			CheckFramesPos(&rc);

+			ModernSkinButton_ReposButtons(m_hWnd, SBRF_DO_NOT_DRAW, &rc);

+			ModernSkinButton_ReposButtons(m_hWnd, SBRF_REDRAW, NULL);

+			if (g_CluiData.fLayered)

+				CallService(MS_SKINENG_UPTATEFRAMEIMAGE, (WPARAM)m_hWnd, 0);

+

+			if (!g_CluiData.fLayered) {

+				g_mutex_bSizing = 1;

+				Sync(CLUIFrames_OnClistResize_mod, (WPARAM)m_hWnd, 1);

+				CLUIFrames_ApplyNewSizes(2);

+				CLUIFrames_ApplyNewSizes(1);

+				SendMessage(m_hWnd, CLN_LISTSIZECHANGE, 0, 0);

+				g_mutex_bSizing = 0;

+			}

 

-				//       ske_RedrawCompleteWindow();

-				if (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0))

-				{ //if g_CluiData.fDocked, dont remember pos (except for width)

-					db_set_dw(NULL,"CList","Height",(DWORD)(rc.bottom - rc.top));

-					db_set_dw(NULL,"CList","x",(DWORD)rc.left);

-					db_set_dw(NULL,"CList","y",(DWORD)rc.top);

-				}

-				else SetWindowRgn(m_hWnd,NULL,0);

-				db_set_dw(NULL,"CList","Width",(DWORD)(rc.right - rc.left));

-

-				if (!g_CluiData.fLayered)

-				{

-					HRGN hRgn1;

-					RECT r;

-					int v,h;

-					int w = 10;

-					GetWindowRect(m_hWnd,&r);

-					h = (r.right-r.left)>(w*2)?w:(r.right-r.left);

-					v = (r.bottom-r.top)>(w*2)?w:(r.bottom-r.top);

-					h = (h < v)?h:v;

-					hRgn1 = CreateRoundRectRgn(0, 0, (r.right-r.left+1),(r.bottom-r.top+1),h,h);

-					if (( db_get_b(NULL,"CLC","RoundCorners",SETTING_ROUNDCORNERS_DEFAULT)) && (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0)))

-						SetWindowRgn(m_hWnd,hRgn1,FALSE);

-					else

-					{

-						DeleteObject(hRgn1);

-						SetWindowRgn(m_hWnd,NULL,FALSE);

-					}

-					RedrawWindow(m_hWnd,NULL,NULL,RDW_INVALIDATE|RDW_ERASE|RDW_FRAME|RDW_UPDATENOW|RDW_ALLCHILDREN);

-				}

+			// if g_CluiData.fDocked, dont remember pos (except for width)

+			if (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0)) {

+				db_set_dw(NULL, "CList", "Height", (DWORD)(rc.bottom - rc.top));

+				db_set_dw(NULL, "CList", "x", (DWORD)rc.left);

+				db_set_dw(NULL, "CList", "y", (DWORD)rc.top);

 			}

-			else {

-				if ( db_get_b(NULL,"CList","Min2Tray",SETTING_MIN2TRAY_DEFAULT)) {

-					CLUI_ShowWindowMod(m_hWnd, SW_HIDE);

-					db_set_b(NULL,"CList","State",SETTING_STATE_HIDDEN);

+			else SetWindowRgn(m_hWnd, NULL, 0);

+			db_set_dw(NULL, "CList", "Width", (DWORD)(rc.right - rc.left));

+

+			if (!g_CluiData.fLayered) {

+				HRGN hRgn1;

+				RECT r;

+				int v, h;

+				int w = 10;

+				GetWindowRect(m_hWnd, &r);

+				h = (r.right - r.left) > (w * 2) ? w : (r.right - r.left);

+				v = (r.bottom - r.top) > (w * 2) ? w : (r.bottom - r.top);

+				h = (h < v) ? h : v;

+				hRgn1 = CreateRoundRectRgn(0, 0, (r.right - r.left + 1), (r.bottom - r.top + 1), h, h);

+				if ((db_get_b(NULL, "CLC", "RoundCorners", SETTING_ROUNDCORNERS_DEFAULT)) && (!CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0)))

+					SetWindowRgn(m_hWnd, hRgn1, FALSE);

+				else {

+					DeleteObject(hRgn1);

+					SetWindowRgn(m_hWnd, NULL, FALSE);

 				}

-				else db_set_b(NULL,"CList","State",SETTING_STATE_MINIMIZED);

-				SetProcessWorkingSetSize(GetCurrentProcess(),-1,-1);

+				RedrawWindow(m_hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ERASE | RDW_FRAME | RDW_UPDATENOW | RDW_ALLCHILDREN);

 			}

-

-			return TRUE;

 		}

-	case WM_WINDOWPOSCHANGING:

-		{

-			WINDOWPOS *wp = (WINDOWPOS *)lParam;

-			if (wp->flags&SWP_HIDEWINDOW && mutex_bAnimationInProgress)

-				return 0;

-			if (g_CluiData.fOnDesktop)

-				wp->flags |= SWP_NOACTIVATE|SWP_NOZORDER;

-			return DefWindowProc(m_hWnd, msg, wParam, lParam);

+		else {

+			if (db_get_b(NULL, "CList", "Min2Tray", SETTING_MIN2TRAY_DEFAULT)) {

+				CLUI_ShowWindowMod(m_hWnd, SW_HIDE);

+				db_set_b(NULL, "CList", "State", SETTING_STATE_HIDDEN);

+			}

+			else db_set_b(NULL, "CList", "State", SETTING_STATE_MINIMIZED);

+			SetProcessWorkingSetSize(GetCurrentProcess(), -1, -1);

 		}

+		return TRUE;

+

+	case WM_WINDOWPOSCHANGING:

+		WINDOWPOS *wp = (WINDOWPOS *)lParam;

+		if (wp->flags&SWP_HIDEWINDOW && mutex_bAnimationInProgress)

+			return 0;

+		if (g_CluiData.fOnDesktop)

+			wp->flags |= SWP_NOACTIVATE | SWP_NOZORDER;

+		return DefWindowProc(m_hWnd, msg, wParam, lParam);

 	}

 	return 0;

 }

 

-LRESULT CLUI::OnThemeChanged(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

+LRESULT CLUI::OnThemeChanged(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

 	xpt_OnWM_THEMECHANGED();

 	return FALSE;

 }

 

-LRESULT CLUI::OnDwmCompositionChanged(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

+LRESULT CLUI::OnDwmCompositionChanged(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

 	g_CluiData.fAeroGlass = false;

 	CLUI_UpdateAeroGlass();

 	return FALSE;

 }

 

-LRESULT CLUI::OnUpdate(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

+LRESULT CLUI::OnUpdate(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

-	if ( g_flag_bPostWasCanceled )

+	if (g_flag_bPostWasCanceled)

 		return FALSE;

-	return ske_ValidateFrameImageProc( NULL );

+	return ske_ValidateFrameImageProc(NULL);

 }

 

-LRESULT CLUI::OnInitMenu(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

+LRESULT CLUI::OnInitMenu(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

 	if (!CLUI::IsMainMenuInited()) {

-		if ( ServiceExists( MS_CLIST_MENUBUILDMAIN ))

-			CallService(MS_CLIST_MENUBUILDMAIN, 0, 0 );

+		if (ServiceExists(MS_CLIST_MENUBUILDMAIN))

+			CallService(MS_CLIST_MENUBUILDMAIN, 0, 0);

 		CLUI::m_fMainMenuInited = TRUE;

 	}

 	return FALSE;

@@ -1938,36 +1880,36 @@ LRESULT CLUI::OnInitMenu(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )
 

 LRESULT CLUI::OnNcPaint(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	int lRes = DefWindowProc( m_hWnd, msg, wParam, lParam);

-	if (!g_CluiData.fLayered && db_get_b( NULL,"CLUI","ShowMainMenu",SETTING_SHOWMAINMENU_DEFAULT )) {

+	int lRes = DefWindowProc(m_hWnd, msg, wParam, lParam);

+	if (!g_CluiData.fLayered && db_get_b(NULL, "CLUI", "ShowMainMenu", SETTING_SHOWMAINMENU_DEFAULT)) {

 		HDC hdc = NULL;

-		if ( msg == WM_PRINT ) hdc = (HDC)wParam;

-		if (!hdc ) hdc = GetWindowDC( m_hWnd );

-		CLUI_DrawMenuBackGround( m_hWnd, hdc, 0, 0 );

-		if ( msg != WM_PRINT ) ReleaseDC( m_hWnd, hdc );

+		if (msg == WM_PRINT) hdc = (HDC)wParam;

+		if (!hdc) hdc = GetWindowDC(m_hWnd);

+		CLUI_DrawMenuBackGround(m_hWnd, hdc, 0, 0);

+		if (msg != WM_PRINT) ReleaseDC(m_hWnd, hdc);

 	}

 	return lRes;

 }

 

-LRESULT CLUI::OnEraseBkgnd(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

+LRESULT CLUI::OnEraseBkgnd(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

 	return TRUE;

 }

 

 LRESULT CLUI::OnNcCreate(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	((LPCREATESTRUCT)lParam)->style  &= ~(CS_HREDRAW | CS_VREDRAW);

-	return DefCluiWndProc( msg, wParam, lParam);

+	((LPCREATESTRUCT)lParam)->style &= ~(CS_HREDRAW | CS_VREDRAW);

+	return DefCluiWndProc(msg, wParam, lParam);

 }

 

 LRESULT CLUI::OnPaint(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	if (!g_CluiData.fLayered && IsWindowVisible(m_hWnd)) {

-		RECT w = {0};

-		RECT w2 = {0};

-		PAINTSTRUCT ps = {0};

+		RECT w = { 0 };

+		RECT w2 = { 0 };

+		PAINTSTRUCT ps = { 0 };

 

-		GetClientRect(m_hWnd,&w);

+		GetClientRect(m_hWnd, &w);

 		if (!(w.right > 0 && w.bottom > 0))

 			return DefWindowProc(m_hWnd, msg, wParam, lParam);

 

@@ -1975,44 +1917,43 @@ LRESULT CLUI::OnPaint(UINT msg, WPARAM wParam, LPARAM lParam)
 			HDC paintDC = GetDC(m_hWnd);

 			w2 = w;

 			HDC hdc = CreateCompatibleDC(paintDC);

-			HBITMAP hbmp = ske_CreateDIB32(w.right,w.bottom);

-			HBITMAP oldbmp = (HBITMAP)SelectObject(hdc,hbmp);

-			ske_ReCreateBackImage(FALSE,NULL);

-			BitBlt(paintDC,w2.left,w2.top,w2.right-w2.left,w2.bottom-w2.top,g_pCachedWindow->hBackDC,w2.left,w2.top,SRCCOPY);

-			SelectObject(hdc,oldbmp);

+			HBITMAP hbmp = ske_CreateDIB32(w.right, w.bottom);

+			HBITMAP oldbmp = (HBITMAP)SelectObject(hdc, hbmp);

+			ske_ReCreateBackImage(FALSE, NULL);

+			BitBlt(paintDC, w2.left, w2.top, w2.right - w2.left, w2.bottom - w2.top, g_pCachedWindow->hBackDC, w2.left, w2.top, SRCCOPY);

+			SelectObject(hdc, oldbmp);

 			DeleteObject(hbmp);

 			DeleteDC(hdc);

-			ReleaseDC(m_hWnd,paintDC);

+			ReleaseDC(m_hWnd, paintDC);

 		}

 		else {

-			HDC hdc = BeginPaint(m_hWnd,&ps);

-			ske_BltBackImage(m_hWnd,hdc,&ps.rcPaint);

+			HDC hdc = BeginPaint(m_hWnd, &ps);

+			ske_BltBackImage(m_hWnd, hdc, &ps.rcPaint);

 			ps.fErase = FALSE;

-			EndPaint(m_hWnd,&ps);

+			EndPaint(m_hWnd, &ps);

 		}

 

-		ValidateRect(m_hWnd,NULL);

+		ValidateRect(m_hWnd, NULL);

 	}

 

-	if (0 && (db_get_dw(NULL,"CLUIFrames","GapBetweenFrames",SETTING_GAPFRAMES_DEFAULT) || db_get_dw(NULL,"CLUIFrames","GapBetweenTitleBar",SETTING_GAPTITLEBAR_DEFAULT)))

-	{

+	if (0 && (db_get_dw(NULL, "CLUIFrames", "GapBetweenFrames", SETTING_GAPFRAMES_DEFAULT) || db_get_dw(NULL, "CLUIFrames", "GapBetweenTitleBar", SETTING_GAPTITLEBAR_DEFAULT))) {

 		if (IsWindowVisible(m_hWnd)) {

 			if (g_CluiData.fLayered)

 				SkinInvalidateFrame(m_hWnd, NULL);

 			else {

-				RECT w = {0};

-				RECT w2 = {0};

-				PAINTSTRUCT ps = {0};

-				GetWindowRect(m_hWnd,&w);

-				OffsetRect(&w,-w.left,-w.top);

-				BeginPaint(m_hWnd,&ps);

-				if ((ps.rcPaint.bottom-ps.rcPaint.top)*(ps.rcPaint.right-ps.rcPaint.left) == 0)

+				RECT w = { 0 };

+				RECT w2 = { 0 };

+				PAINTSTRUCT ps = { 0 };

+				GetWindowRect(m_hWnd, &w);

+				OffsetRect(&w, -w.left, -w.top);

+				BeginPaint(m_hWnd, &ps);

+				if ((ps.rcPaint.bottom - ps.rcPaint.top)*(ps.rcPaint.right - ps.rcPaint.left) == 0)

 					w2 = w;

 				else

 					w2 = ps.rcPaint;

-				SkinDrawGlyph(ps.hdc,&w,&w2,"Main,ID=Background,Opt=Non-Layered");

+				SkinDrawGlyph(ps.hdc, &w, &w2, "Main,ID=Background,Opt=Non-Layered");

 				ps.fErase = FALSE;

-				EndPaint(m_hWnd,&ps);

+				EndPaint(m_hWnd, &ps);

 			}

 		}

 	}

@@ -2026,33 +1967,33 @@ LRESULT CLUI::OnCreate(UINT msg, WPARAM wParam, LPARAM lParam)
 	cliCluiProtocolStatusChanged(0, 0);

 

 	MENUITEMINFO mii = { sizeof(mii) };

-	mii.fMask = MIIM_TYPE|MIIM_DATA;

+	mii.fMask = MIIM_TYPE | MIIM_DATA;

 	mii.dwItemData = MENU_MIRANDAMENU;

 	mii.fType = MFT_OWNERDRAW;

 	mii.dwTypeData = NULL;

-	SetMenuItemInfo(GetMenu(m_hWnd), 0, TRUE,&mii);

+	SetMenuItemInfo(GetMenu(m_hWnd), 0, TRUE, &mii);

 

 	// mii.fMask = MIIM_TYPE;

 	mii.fType = MFT_OWNERDRAW;

 	mii.dwItemData = MENU_STATUSMENU;

-	SetMenuItemInfo(GetMenu(m_hWnd),1,TRUE,&mii);

+	SetMenuItemInfo(GetMenu(m_hWnd), 1, TRUE, &mii);

 

 	// mii.fMask = MIIM_TYPE;

 	mii.fType = MFT_OWNERDRAW;

 	mii.dwItemData = MENU_MINIMIZE;

-	SetMenuItemInfo(GetMenu(m_hWnd),2,TRUE,&mii);

+	SetMenuItemInfo(GetMenu(m_hWnd), 2, TRUE, &mii);

 

 	uMsgGetProfile = RegisterWindowMessage(_T("Miranda::GetProfile")); // don't localise

 	bTransparentFocus = 1;

 	return FALSE;

 }

 

-LRESULT CLUI::OnSetAllExtraIcons(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

+LRESULT CLUI::OnSetAllExtraIcons(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

 	return FALSE;

 }

 

-LRESULT CLUI::OnCreateClc(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )

+LRESULT CLUI::OnCreateClc(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/)

 {

 	CreateCLC();

 	if (db_get_b(NULL, "CList", "ShowOnStart", SETTING_SHOWONSTART_DEFAULT))

@@ -2064,13 +2005,13 @@ LRESULT CLUI::OnCreateClc(UINT /*msg*/, WPARAM /*wParam*/, LPARAM /*lParam*/ )
 LRESULT CLUI::OnLButtonDown(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	POINT pt = UNPACK_POINT(lParam);

-	ClientToScreen( m_hWnd, &pt );

+	ClientToScreen(m_hWnd, &pt);

 

-	if ( CLUI_SizingOnBorder( pt, 1 )) {

+	if (CLUI_SizingOnBorder(pt, 1)) {

 		mutex_bIgnoreActivation = TRUE;

 		return FALSE;

 	}

-	return DefCluiWndProc( msg, wParam, lParam);

+	return DefCluiWndProc(msg, wParam, lParam);

 }

 

 LRESULT CLUI::OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam)

@@ -2082,7 +2023,7 @@ LRESULT CLUI::OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam)
 		wParam = 0;

 		lParam = 0;

 

-		if ( CLUI_SizingOnBorder(pt, 1)) {

+		if (CLUI_SizingOnBorder(pt, 1)) {

 			mutex_bIgnoreActivation = TRUE;

 			return 0;

 		}

@@ -2092,7 +2033,7 @@ LRESULT CLUI::OnParentNotify(UINT msg, WPARAM wParam, LPARAM lParam)
 

 LRESULT CLUI::OnSetFocus(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	if ( hFrameContactTree && (!CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM( FO_FLOATING, hFrameContactTree ), 0 )))

+	if (hFrameContactTree && (!CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM(FO_FLOATING, hFrameContactTree), 0)))

 		SetFocus(pcli->hwndContactTree);

 

 	return FALSE;

@@ -2101,17 +2042,16 @@ LRESULT CLUI::OnSetFocus(UINT msg, WPARAM wParam, LPARAM lParam)
 LRESULT CLUI::OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	int status;

-	PROTOTICKS *pt;

 

-	for (int i=0; i < 64; i++) {

-		pt = &CycleStartTick[i];

-		if (pt->szProto != NULL && pt->bTimerCreated) {

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

+		PROTOTICKS *pt = &arTicks[i];

+		if (pt->bTimerCreated) {

 			if (pt->bGlobal)

-				status = g_bMultiConnectionMode?ID_STATUS_CONNECTING:0;

+				status = g_bMultiConnectionMode ? ID_STATUS_CONNECTING : 0;

 			else

-				status = CallProtoService(pt->szProto,PS_GETSTATUS, 0, 0);

+				status = CallProtoService(pt->szProto, PS_GETSTATUS, 0, 0);

 

-			if (!(status >= ID_STATUS_CONNECTING && status <= ID_STATUS_CONNECTING+MAX_CONNECT_RETRIES)) {

+			if (!(status >= ID_STATUS_CONNECTING && status <= ID_STATUS_CONNECTING + MAX_CONNECT_RETRIES)) {

 				pt->nCycleStartTick = 0;

 				ImageList_Destroy(pt->himlIconList);

 				pt->himlIconList = NULL;

@@ -2121,17 +2061,17 @@ LRESULT CLUI::OnStatusBarUpdateTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 		}

 	}

 

-	pt = &CycleStartTick[wParam - TM_STATUSBARUPDATE];

+	PROTOTICKS *pt = &arTicks[wParam - TM_STATUSBARUPDATE];

 

 	if (IsWindowVisible(pcli->hwndStatus))

-		pcli->pfnInvalidateRect(pcli->hwndStatus,NULL,0);

+		pcli->pfnInvalidateRect(pcli->hwndStatus, NULL, 0);

 	if (pt->bGlobal)

 		pcli->pfnTrayIconUpdateBase(g_szConnectingProto);

 	else

 		pcli->pfnTrayIconUpdateBase(pt->szProto);

 

-	pcli->pfnInvalidateRect(pcli->hwndStatus,NULL,TRUE);

-	return DefCluiWndProc( msg, wParam, lParam);

+	pcli->pfnInvalidateRect(pcli->hwndStatus, NULL, TRUE);

+	return DefCluiWndProc(msg, wParam, lParam);

 }

 

 LRESULT CLUI::OnAutoAlphaTimer(UINT msg, WPARAM wParam, LPARAM lParam)

@@ -2139,7 +2079,7 @@ LRESULT CLUI::OnAutoAlphaTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 	int inwnd;

 

 	if (GetForegroundWindow() == m_hWnd) {

-		KillTimer(m_hWnd,TM_AUTOALPHA);

+		KillTimer(m_hWnd, TM_AUTOALPHA);

 		inwnd = TRUE;

 	}

 	else {

@@ -2147,8 +2087,8 @@ LRESULT CLUI::OnAutoAlphaTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 		HWND hwndPt = WindowFromPoint(pt);

 

 		inwnd = CLUI_CheckOwnedByClui(hwndPt);

-		if (! inwnd )

-			inwnd = ( GetCapture() == pcli->hwndContactList );

+		if (!inwnd)

+			inwnd = (GetCapture() == pcli->hwndContactList);

 	}

 

 	if (inwnd != bTransparentFocus) {

@@ -2156,12 +2096,12 @@ LRESULT CLUI::OnAutoAlphaTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 		HWND hwn = GetCapture();

 		bTransparentFocus = inwnd;

 		if (bTransparentFocus)

-			CLUI_SmoothAlphaTransition(m_hWnd, (BYTE)db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), 1);

+			CLUI_SmoothAlphaTransition(m_hWnd, (BYTE)db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT), 1);

 		else

-			CLUI_SmoothAlphaTransition(m_hWnd, (BYTE)(g_bTransparentFlag ? db_get_b(NULL,"CList","AutoAlpha",SETTING_AUTOALPHA_DEFAULT) : 255), 1);

+			CLUI_SmoothAlphaTransition(m_hWnd, (BYTE)(g_bTransparentFlag ? db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT) : 255), 1);

 	}

 	if (!bTransparentFocus)

-		KillTimer(m_hWnd,TM_AUTOALPHA);

+		KillTimer(m_hWnd, TM_AUTOALPHA);

 	return TRUE;

 }

 

@@ -2175,8 +2115,8 @@ LRESULT CLUI::OnDelayedSizingTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 {

 	if (mutex_bDelayedSizing && !mutex_bDuringSizing) {

 		mutex_bDelayedSizing = 0;

-		KillTimer( m_hWnd,TM_DELAYEDSIZING );

-		pcli->pfnClcBroadcast(INTM_SCROLLBARCHANGED, 0, 0 );

+		KillTimer(m_hWnd, TM_DELAYEDSIZING);

+		pcli->pfnClcBroadcast(INTM_SCROLLBARCHANGED, 0, 0);

 	}

 	return TRUE;

 }

@@ -2184,13 +2124,13 @@ LRESULT CLUI::OnDelayedSizingTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 LRESULT CLUI::OnBringOutTimer(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	//hide

-	KillTimer(m_hWnd,TM_BRINGINTIMEOUT);

-	KillTimer(m_hWnd,TM_BRINGOUTTIMEOUT);

+	KillTimer(m_hWnd, TM_BRINGINTIMEOUT);

+	KillTimer(m_hWnd, TM_BRINGOUTTIMEOUT);

 	bShowEventStarted = 0;

 	POINT pt; GetCursorPos(&pt);

 	HWND hAux = WindowFromPoint(pt);

 	BOOL mouse_in_window = CLUI_CheckOwnedByClui(hAux);

-	if (!mouse_in_window && GetForegroundWindow() != m_hWnd )

+	if (!mouse_in_window && GetForegroundWindow() != m_hWnd)

 		CLUI_HideBehindEdge();

 	return TRUE;

 }

@@ -2198,50 +2138,50 @@ LRESULT CLUI::OnBringOutTimer(UINT msg, WPARAM wParam, LPARAM lParam)
 LRESULT CLUI::OnBringInTimer(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	//show

-	KillTimer(m_hWnd,TM_BRINGINTIMEOUT);

+	KillTimer(m_hWnd, TM_BRINGINTIMEOUT);

 	bShowEventStarted = 0;

-	KillTimer(m_hWnd,TM_BRINGOUTTIMEOUT);

+	KillTimer(m_hWnd, TM_BRINGOUTTIMEOUT);

 	POINT pt; GetCursorPos(&pt);

 	HWND hAux = WindowFromPoint(pt);

 	BOOL mouse_in_window = FALSE;

-	while(hAux != NULL) {

+	while (hAux != NULL) {

 		if (hAux == m_hWnd) {

 			mouse_in_window = TRUE;

 			break;

 		}

 		hAux = GetParent(hAux);

 	}

-	if ( mouse_in_window )

+	if (mouse_in_window)

 		CLUI_ShowFromBehindEdge();

 	return TRUE;

 }

 

 LRESULT CLUI::OnUpdateBringTimer(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	CLUI_UpdateTimer( 0 );

+	CLUI_UpdateTimer(0);

 	return TRUE;

 }

 

 LRESULT CLUI::OnTimer(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	if ( MirandaExiting())

+	if (MirandaExiting())

 		return FALSE;

 

-	if ((int)wParam >= TM_STATUSBARUPDATE && (int)wParam <= TM_STATUSBARUPDATE+64 ) {

+	if ((int)wParam >= TM_STATUSBARUPDATE && (int)wParam <= TM_STATUSBARUPDATE + 64) {

 		if (!pcli->hwndStatus)

 			return FALSE;

-		return OnStatusBarUpdateTimer( msg, wParam, lParam);

+		return OnStatusBarUpdateTimer(msg, wParam, lParam);

 	}

 

-	switch ( wParam ) {

-		case TM_AUTOALPHA:				return OnAutoAlphaTimer( msg, wParam, lParam);

-		case TM_SMOTHALPHATRANSITION:	return OnSmoothAlphaTransitionTimer( msg, wParam, lParam);

-		case TM_DELAYEDSIZING:			return OnDelayedSizingTimer( msg, wParam, lParam);

-		case TM_BRINGOUTTIMEOUT:		return OnBringOutTimer( msg, wParam, lParam);

-		case TM_BRINGINTIMEOUT:			return OnBringInTimer( msg, wParam, lParam);

-		case TM_UPDATEBRINGTIMER:		return OnUpdateBringTimer( msg, wParam, lParam);

+	switch (wParam) {

+		case TM_AUTOALPHA:				return OnAutoAlphaTimer(msg, wParam, lParam);

+		case TM_SMOTHALPHATRANSITION:	return OnSmoothAlphaTransitionTimer(msg, wParam, lParam);

+		case TM_DELAYEDSIZING:			return OnDelayedSizingTimer(msg, wParam, lParam);

+		case TM_BRINGOUTTIMEOUT:		return OnBringOutTimer(msg, wParam, lParam);

+		case TM_BRINGINTIMEOUT:			return OnBringInTimer(msg, wParam, lParam);

+		case TM_UPDATEBRINGTIMER:		return OnUpdateBringTimer(msg, wParam, lParam);

 	}

-	return DefCluiWndProc( msg, wParam, lParam);

+	return DefCluiWndProc(msg, wParam, lParam);

 }

 

 

@@ -2249,44 +2189,43 @@ LRESULT CLUI::OnActivate(UINT msg, WPARAM wParam, LPARAM lParam)
 {

 	SetCursor(LoadCursor(NULL, IDC_ARROW));

 	SendMessage(pcli->hwndContactTree, WM_ACTIVATE, wParam, lParam);

-	if ( db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT)) {

-		if (wParam == WA_INACTIVE && ((HWND)lParam != m_hWnd) && GetParent((HWND)lParam) != m_hWnd)

-		{

+	if (db_get_b(NULL, "ModernData", "HideBehind", SETTING_HIDEBEHIND_DEFAULT)) {

+		if (wParam == WA_INACTIVE && ((HWND)lParam != m_hWnd) && GetParent((HWND)lParam) != m_hWnd) {

 			if (!g_bCalledFromShowHide) CLUI_UpdateTimer(0);

 		}

-		else if (!g_bCalledFromShowHide )

+		else if (!g_bCalledFromShowHide)

 			CLUI_ShowFromBehindEdge();

 	}

 

 	if (!IsWindowVisible(m_hWnd) || mutex_bShowHideCalledFromAnimation) {

-		KillTimer(m_hWnd,TM_AUTOALPHA);

+		KillTimer(m_hWnd, TM_AUTOALPHA);

 		return 0;

 	}

 

 	if (wParam == WA_INACTIVE && ((HWND)lParam != m_hWnd) && !CLUI_CheckOwnedByClui((HWND)lParam)) {

 		if (g_bTransparentFlag && bTransparentFocus)

-			CLUI_SafeSetTimer(m_hWnd, TM_AUTOALPHA,250, NULL);

+			CLUI_SafeSetTimer(m_hWnd, TM_AUTOALPHA, 250, NULL);

 	}

 	else {

-		if (!db_get_b(NULL,"CList","OnTop",SETTING_ONTOP_DEFAULT))

-			Sync(CLUIFrames_ActivateSubContainers,TRUE);

+		if (!db_get_b(NULL, "CList", "OnTop", SETTING_ONTOP_DEFAULT))

+			Sync(CLUIFrames_ActivateSubContainers, TRUE);

 		if (g_bTransparentFlag) {

-			KillTimer(m_hWnd,TM_AUTOALPHA);

-			CLUI_SmoothAlphaTransition(m_hWnd, db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), 1);

+			KillTimer(m_hWnd, TM_AUTOALPHA);

+			CLUI_SmoothAlphaTransition(m_hWnd, db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT), 1);

 			bTransparentFocus = 1;

 		}

 	}

-	RedrawWindow(m_hWnd,NULL,NULL,RDW_INVALIDATE|RDW_ALLCHILDREN);

+	RedrawWindow(m_hWnd, NULL, NULL, RDW_INVALIDATE | RDW_ALLCHILDREN);

 	if (g_bTransparentFlag) {

 		BYTE alpha;

 		if (wParam != WA_INACTIVE || CLUI_CheckOwnedByClui((HWND)lParam) || ((HWND)lParam == m_hWnd) || GetParent((HWND)lParam) == m_hWnd)

-			alpha = db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT);

+			alpha = db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT);

 		else

-			alpha = g_bTransparentFlag ? db_get_b(NULL,"CList","AutoAlpha",SETTING_AUTOALPHA_DEFAULT) : 255;

+			alpha = g_bTransparentFlag ? db_get_b(NULL, "CList", "AutoAlpha", SETTING_AUTOALPHA_DEFAULT) : 255;

 		CLUI_SmoothAlphaTransition(m_hWnd, alpha, 1);

 		return 1;

 	}

-	return DefWindowProc(m_hWnd,msg,wParam,lParam);

+	return DefWindowProc(m_hWnd, msg, wParam, lParam);

 }

 

 LRESULT CLUI::OnSetCursor(UINT msg, WPARAM wParam, LPARAM lParam)

@@ -2294,11 +2233,10 @@ LRESULT CLUI::OnSetCursor(UINT msg, WPARAM wParam, LPARAM lParam)
 	HWND gf = GetForegroundWindow();

 	if (g_CluiData.nBehindEdgeState >= 0)  CLUI_UpdateTimer(1);

 	if (g_bTransparentFlag) {

-		if (!bTransparentFocus && gf != m_hWnd)

-		{

-			CLUI_SmoothAlphaTransition(m_hWnd, db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT), 1);

+		if (!bTransparentFocus && gf != m_hWnd) {

+			CLUI_SmoothAlphaTransition(m_hWnd, db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT), 1);

 			bTransparentFocus = 1;

-			CLUI_SafeSetTimer(m_hWnd, TM_AUTOALPHA,250, NULL);

+			CLUI_SafeSetTimer(m_hWnd, TM_AUTOALPHA, 250, NULL);

 		}

 	}

 	int k = CLUI_TestCursorOnBorders();

@@ -2307,12 +2245,12 @@ LRESULT CLUI::OnSetCursor(UINT msg, WPARAM wParam, LPARAM lParam)
 

 LRESULT CLUI::OnMouseActivate(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	if ( mutex_bIgnoreActivation ) {

+	if (mutex_bIgnoreActivation) {

 		mutex_bIgnoreActivation = 0;

 		return MA_NOACTIVATEANDEAT;

 	}

 

-	int lRes = DefWindowProc(m_hWnd,msg,wParam,lParam);

+	int lRes = DefWindowProc(m_hWnd, msg, wParam, lParam);

 	CLUIFrames_RepaintSubContainers();

 	return lRes;

 }

@@ -2320,8 +2258,8 @@ LRESULT CLUI::OnMouseActivate(UINT msg, WPARAM wParam, LPARAM lParam)
 LRESULT CLUI::OnNcLButtonDown(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	POINT pt = UNPACK_POINT(lParam);

-	int k = CLUI_SizingOnBorder(pt,1);

-	return k ? k : DefWindowProc( m_hWnd, msg, wParam, lParam);

+	int k = CLUI_SizingOnBorder(pt, 1);

+	return k ? k : DefWindowProc(m_hWnd, msg, wParam, lParam);

 }

 

 LRESULT CLUI::OnNcLButtonDblClk(UINT msg, WPARAM wParam, LPARAM lParam)

@@ -2331,18 +2269,18 @@ LRESULT CLUI::OnNcLButtonDblClk(UINT msg, WPARAM wParam, LPARAM lParam)
 		GetWindowRect(m_hWnd, &rc);

 

 		POINT pt = UNPACK_POINT(lParam);

-		if ( pt.x > rc.right - 16 && pt.x < rc.right )

+		if (pt.x > rc.right - 16 && pt.x < rc.right)

 			return CallService(MS_CLIST_SHOWHIDE, 0, 0);

 	}

-	return DefCluiWndProc( msg, wParam, lParam);

+	return DefCluiWndProc(msg, wParam, lParam);

 }

 

 LRESULT CLUI::OnNcHitTest(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	LRESULT result = DefWindowProc(m_hWnd,WM_NCHITTEST,wParam,lParam);

+	LRESULT result = DefWindowProc(m_hWnd, WM_NCHITTEST, wParam, lParam);

 

-	if ((g_CluiData.fAutoSize) && ( result == HTSIZE || result == HTTOP ||

-		result == HTTOPLEFT || result == HTTOPRIGHT  ||

+	if ((g_CluiData.fAutoSize) && (result == HTSIZE || result == HTTOP ||

+		result == HTTOPLEFT || result == HTTOPRIGHT ||

 		result == HTBOTTOM || result == HTBOTTOMRIGHT ||

 		result == HTBOTTOMLEFT))

 		return HTCLIENT;

@@ -2350,16 +2288,16 @@ LRESULT CLUI::OnNcHitTest(UINT msg, WPARAM wParam, LPARAM lParam)
 	if (result == HTMENU) {

 		POINT pt = UNPACK_POINT(lParam);

 		int t = MenuItemFromPoint(m_hWnd, g_hMenuMain, pt);

-		if (t == -1 && ( db_get_b(NULL,"CLUI","ClientAreaDrag",SETTING_CLIENTDRAG_DEFAULT)))

+		if (t == -1 && (db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT)))

 			return HTCAPTION;

 	}

 

 	if (result == HTCLIENT) {

 		POINT pt = UNPACK_POINT(lParam);

 		int k = CLUI_SizingOnBorder(pt, 0);

-		if (!k && ( db_get_b(NULL,"CLUI","ClientAreaDrag",SETTING_CLIENTDRAG_DEFAULT)))

+		if (!k && (db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT)))

 			return HTCAPTION;

-		else return k+9;

+		else return k + 9;

 	}

 	return result;

 }

@@ -2369,10 +2307,10 @@ LRESULT CLUI::OnShowWindow(UINT msg, WPARAM wParam, LPARAM lParam)
 	if (lParam) return 0;

 	if (mutex_bShowHideCalledFromAnimation) return 1;

 

-	BYTE gAlpha = (!wParam) ? 0 : (db_get_b(NULL,"CList","Transparent",SETTING_TRANSPARENT_DEFAULT)?db_get_b(NULL,"CList","Alpha",SETTING_ALPHA_DEFAULT):255);

+	BYTE gAlpha = (!wParam) ? 0 : (db_get_b(NULL, "CList", "Transparent", SETTING_TRANSPARENT_DEFAULT) ? db_get_b(NULL, "CList", "Alpha", SETTING_ALPHA_DEFAULT) : 255);

 	if (wParam) {

 		g_CluiData.bCurrentAlpha = 0;

-		Sync(CLUIFrames_OnShowHide, pcli->hwndContactList,1);

+		Sync(CLUIFrames_OnShowHide, pcli->hwndContactList, 1);

 		ske_RedrawCompleteWindow();

 	}

 	CLUI_SmoothAlphaTransition(m_hWnd, gAlpha, 1);

@@ -2405,8 +2343,8 @@ LRESULT CLUI::OnKeyDown(UINT msg, WPARAM wParam, LPARAM lParam)
 

 LRESULT CLUI::OnGetMinMaxInfo(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	DefWindowProc(m_hWnd,msg,wParam,lParam);

-	((LPMINMAXINFO)lParam)->ptMinTrackSize.x = max(db_get_w(NULL,"CLUI","MinWidth",SETTING_MINWIDTH_DEFAULT),max(18,db_get_b(NULL,"CLUI","LeftClientMargin",SETTING_LEFTCLIENTMARIGN_DEFAULT)+db_get_b(NULL,"CLUI","RightClientMargin",SETTING_RIGHTCLIENTMARIGN_DEFAULT)+18));

+	DefWindowProc(m_hWnd, msg, wParam, lParam);

+	((LPMINMAXINFO)lParam)->ptMinTrackSize.x = max(db_get_w(NULL, "CLUI", "MinWidth", SETTING_MINWIDTH_DEFAULT), max(18, db_get_b(NULL, "CLUI", "LeftClientMargin", SETTING_LEFTCLIENTMARIGN_DEFAULT) + db_get_b(NULL, "CLUI", "RightClientMargin", SETTING_RIGHTCLIENTMARIGN_DEFAULT) + 18));

 	if (nRequiredHeight == 0)

 		((LPMINMAXINFO)lParam)->ptMinTrackSize.y = CLUIFramesGetMinHeight();

 

@@ -2415,32 +2353,32 @@ LRESULT CLUI::OnGetMinMaxInfo(UINT msg, WPARAM wParam, LPARAM lParam)
 

 LRESULT CLUI::OnMoving(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	CallWindowProc( DefWindowProc, m_hWnd, msg, wParam, lParam);

-	if ( FALSE )  //showcontents is turned on

-		Sync(CLUIFrames_OnMoving,m_hWnd,(RECT*)lParam);

+	CallWindowProc(DefWindowProc, m_hWnd, msg, wParam, lParam);

+	if (FALSE)  //showcontents is turned on

+		Sync(CLUIFrames_OnMoving, m_hWnd, (RECT*)lParam);

 

 	return TRUE;

 }

 

-LRESULT CLUI::OnListSizeChangeNotify( NMCLISTCONTROL * pnmc )

+LRESULT CLUI::OnListSizeChangeNotify(NMCLISTCONTROL * pnmc)

 {

 	// TODO: Check and refactor possible problem of clist resized to full screen problem

-	static RECT rcWindow,rcTree,rcTree2,rcWorkArea,rcOld;

-	int maxHeight, minHeight,newHeight;

+	static RECT rcWindow, rcTree, rcTree2, rcWorkArea, rcOld;

+	int maxHeight, minHeight, newHeight;

 	int winstyle;

 	if (mutex_bDisableAutoUpdate)

 		return FALSE;

 	if (mutex_bDuringSizing)

 		rcWindow = rcSizingRect;

 	else

-		GetWindowRect(m_hWnd,&rcWindow);

+		GetWindowRect(m_hWnd, &rcWindow);

 	if (!g_CluiData.fAutoSize || pcli->hwndContactTree == 0 || CallService(MS_CLIST_DOCKINGISDOCKED, 0, 0))

 		return FALSE;

 

-	maxHeight = db_get_b(NULL,"CLUI","MaxSizeHeight",SETTING_MAXSIZEHEIGHT_DEFAULT);

-	minHeight = db_get_b(NULL,"CLUI","MinSizeHeight",SETTING_MINSIZEHEIGHT_DEFAULT);

+	maxHeight = db_get_b(NULL, "CLUI", "MaxSizeHeight", SETTING_MAXSIZEHEIGHT_DEFAULT);

+	minHeight = db_get_b(NULL, "CLUI", "MinSizeHeight", SETTING_MINSIZEHEIGHT_DEFAULT);

 	rcOld = rcWindow;

-	GetWindowRect(pcli->hwndContactTree,&rcTree);

+	GetWindowRect(pcli->hwndContactTree, &rcTree);

 

 	FRAMEWND *frm = FindFrameByItsHWND(pcli->hwndContactTree);

 	if (frm)

@@ -2448,34 +2386,34 @@ LRESULT CLUI::OnListSizeChangeNotify( NMCLISTCONTROL * pnmc )
 	else

 		SetRect(&rcTree2, 0, 0, 0, 0);

 

-	winstyle = GetWindowLongPtr(pcli->hwndContactTree,GWL_STYLE);

+	winstyle = GetWindowLongPtr(pcli->hwndContactTree, GWL_STYLE);

 

-	SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea,FALSE);

+	SystemParametersInfo(SPI_GETWORKAREA, 0, &rcWorkArea, FALSE);

 	HMONITOR hMon = MonitorFromWindow(pcli->hwndContactTree, MONITOR_DEFAULTTONEAREST);

 	MONITORINFO mi = { sizeof(mi) };

 	if (GetMonitorInfo(hMon, &mi))

 		rcWorkArea = mi.rcWork;

 

-	if (pnmc->pt.y>(rcWorkArea.bottom-rcWorkArea.top))

-		pnmc->pt.y = (rcWorkArea.bottom-rcWorkArea.top);

+	if (pnmc->pt.y > (rcWorkArea.bottom - rcWorkArea.top))

+		pnmc->pt.y = (rcWorkArea.bottom - rcWorkArea.top);

 

 	nLastRequiredHeight = pnmc->pt.y;

-	newHeight = max(CLUIFramesGetMinHeight(),max(pnmc->pt.y,3)+1+((winstyle&WS_BORDER)?2:0)+(rcWindow.bottom-rcWindow.top)-(rcTree.bottom-rcTree.top));

-	if (newHeight < (rcWorkArea.bottom-rcWorkArea.top)*minHeight/100)

-		newHeight = (rcWorkArea.bottom-rcWorkArea.top)*minHeight/100;

+	newHeight = max(CLUIFramesGetMinHeight(), max(pnmc->pt.y, 3) + 1 + ((winstyle&WS_BORDER) ? 2 : 0) + (rcWindow.bottom - rcWindow.top) - (rcTree.bottom - rcTree.top));

+	if (newHeight < (rcWorkArea.bottom - rcWorkArea.top)*minHeight / 100)

+		newHeight = (rcWorkArea.bottom - rcWorkArea.top)*minHeight / 100;

 

-	if (newHeight>(rcWorkArea.bottom-rcWorkArea.top)*maxHeight/100)

-		newHeight = (rcWorkArea.bottom-rcWorkArea.top)*maxHeight/100;

+	if (newHeight>(rcWorkArea.bottom - rcWorkArea.top)*maxHeight / 100)

+		newHeight = (rcWorkArea.bottom - rcWorkArea.top)*maxHeight / 100;

 

-	if (newHeight == (rcWindow.bottom-rcWindow.top)) return 0;

+	if (newHeight == (rcWindow.bottom - rcWindow.top)) return 0;

 

-	if ( db_get_b(NULL,"CLUI","AutoSizeUpward",SETTING_AUTOSIZEUPWARD_DEFAULT)) {

-		rcWindow.top = rcWindow.bottom-newHeight;

+	if (db_get_b(NULL, "CLUI", "AutoSizeUpward", SETTING_AUTOSIZEUPWARD_DEFAULT)) {

+		rcWindow.top = rcWindow.bottom - newHeight;

 		if (rcWindow.top < rcWorkArea.top) rcWindow.top = rcWorkArea.top;

 	}

 	else {

-		rcWindow.bottom = rcWindow.top+newHeight;

-		if (rcWindow.bottom>rcWorkArea.bottom) rcWindow.bottom = rcWorkArea.bottom;

+		rcWindow.bottom = rcWindow.top + newHeight;

+		if (rcWindow.bottom > rcWorkArea.bottom) rcWindow.bottom = rcWorkArea.bottom;

 	}

 	if (nRequiredHeight == 1)

 		return FALSE;

@@ -2490,36 +2428,36 @@ LRESULT CLUI::OnListSizeChangeNotify( NMCLISTCONTROL * pnmc )
 	else bNeedFixSizingRect = 0;

 

 	if (!mutex_bDuringSizing)

-		SetWindowPos(m_hWnd, 0, rcWindow.left,rcWindow.top,rcWindow.right-rcWindow.left,rcWindow.bottom-rcWindow.top,SWP_NOZORDER|SWP_NOACTIVATE);

+		SetWindowPos(m_hWnd, 0, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, SWP_NOZORDER | SWP_NOACTIVATE);

 	else

-		SetWindowPos(m_hWnd, 0, rcWindow.left,rcWindow.top,rcWindow.right-rcWindow.left,rcWindow.bottom-rcWindow.top,SWP_NOZORDER|SWP_NOACTIVATE);

+		SetWindowPos(m_hWnd, 0, rcWindow.left, rcWindow.top, rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, SWP_NOZORDER | SWP_NOACTIVATE);

 

 	nRequiredHeight = 0;

 

 	return FALSE;

 }

 

-LRESULT CLUI::OnClickNotify( NMCLISTCONTROL * pnmc )

+LRESULT CLUI::OnClickNotify(NMCLISTCONTROL * pnmc)

 {

 	DWORD hitFlags;

-	HANDLE hItem = (HANDLE)SendMessage(pcli->hwndContactTree,CLM_HITTEST,(WPARAM)&hitFlags,MAKELPARAM(pnmc->pt.x,pnmc->pt.y));

+	HANDLE hItem = (HANDLE)SendMessage(pcli->hwndContactTree, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(pnmc->pt.x, pnmc->pt.y));

 	if (hItem && !(hitFlags & CLCHT_NOWHERE))

 		return DefCluiWndProc(WM_NOTIFY, 0, (LPARAM)pnmc);

 

 	if ((hitFlags & (CLCHT_NOWHERE | CLCHT_INLEFTMARGIN | CLCHT_BELOWITEMS)) == 0)

 		return DefCluiWndProc(WM_NOTIFY, 0, (LPARAM)pnmc);

 

-	if ( db_get_b(NULL,"CLUI","ClientAreaDrag",SETTING_CLIENTDRAG_DEFAULT)) {

+	if (db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT)) {

 		POINT pt;

 		int res;

 		pt = pnmc->pt;

-		ClientToScreen(pcli->hwndContactTree,&pt);

-		res = PostMessage(m_hWnd, WM_SYSCOMMAND, SC_MOVE|HTCAPTION,MAKELPARAM(pt.x,pt.y));

+		ClientToScreen(pcli->hwndContactTree, &pt);

+		res = PostMessage(m_hWnd, WM_SYSCOMMAND, SC_MOVE | HTCAPTION, MAKELPARAM(pt.x, pt.y));

 		return res;

 	}

 

-	if ( db_get_b(NULL,"CLUI","DragToScroll",SETTING_DRAGTOSCROLL_DEFAULT) && !db_get_b(NULL,"CLUI","ClientAreaDrag",SETTING_CLIENTDRAG_DEFAULT))

-		return ClcEnterDragToScroll(pcli->hwndContactTree,pnmc->pt.y);

+	if (db_get_b(NULL, "CLUI", "DragToScroll", SETTING_DRAGTOSCROLL_DEFAULT) && !db_get_b(NULL, "CLUI", "ClientAreaDrag", SETTING_CLIENTDRAG_DEFAULT))

+		return ClcEnterDragToScroll(pcli->hwndContactTree, pnmc->pt.y);

 

 	return 0;

 }

@@ -2527,14 +2465,14 @@ LRESULT CLUI::OnClickNotify( NMCLISTCONTROL * pnmc )
 LRESULT CLUI::OnNotify(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	LPNMHDR pnmhdr = (LPNMHDR)lParam;

-	if ( pnmhdr->hwndFrom != pcli->hwndContactTree )

-		return DefCluiWndProc( msg, wParam, lParam);

+	if (pnmhdr->hwndFrom != pcli->hwndContactTree)

+		return DefCluiWndProc(msg, wParam, lParam);

 

-	switch ( pnmhdr->code) {

-		case CLN_LISTSIZECHANGE: return OnListSizeChangeNotify((NMCLISTCONTROL *)pnmhdr );

-		case NM_CLICK:           return OnClickNotify((NMCLISTCONTROL *)pnmhdr );

+	switch (pnmhdr->code) {

+	case CLN_LISTSIZECHANGE: return OnListSizeChangeNotify((NMCLISTCONTROL *)pnmhdr);

+	case NM_CLICK:           return OnClickNotify((NMCLISTCONTROL *)pnmhdr);

 	}

-	return DefCluiWndProc( msg, wParam, lParam);

+	return DefCluiWndProc(msg, wParam, lParam);

 }

 

 LRESULT CLUI::OnContextMenu(UINT msg, WPARAM wParam, LPARAM lParam)

@@ -2542,19 +2480,19 @@ LRESULT CLUI::OnContextMenu(UINT msg, WPARAM wParam, LPARAM lParam)
 	POINT pt = UNPACK_POINT(lParam);

 	// x/y might be -1 if it was generated by a kb click

 	RECT rc;

-	GetWindowRect(pcli->hwndContactTree,&rc);

-	if ( pt.x == -1 && pt.y == -1) {

+	GetWindowRect(pcli->hwndContactTree, &rc);

+	if (pt.x == -1 && pt.y == -1) {

 		// all this is done in screen-coords!

 		GetCursorPos(&pt);

 		// the mouse isnt near the window, so put it in the middle of the window

-		if (!PtInRect(&rc,pt)) {

+		if (!PtInRect(&rc, pt)) {

 			pt.x = rc.left + (rc.right - rc.left) / 2;

 			pt.y = rc.top + (rc.bottom - rc.top) / 2;

 		}

 	}

-	if (PtInRect( &rc ,pt )) {

+	if (PtInRect(&rc, pt)) {

 		HMENU hMenu = (HMENU)CallService(MS_CLIST_MENUBUILDGROUP, 0, 0);

-		TrackPopupMenu(hMenu,TPM_TOPALIGN|TPM_LEFTALIGN|TPM_LEFTBUTTON,pt.x,pt.y, 0, m_hWnd,NULL);

+		TrackPopupMenu(hMenu, TPM_TOPALIGN | TPM_LEFTALIGN | TPM_LEFTBUTTON, pt.x, pt.y, 0, m_hWnd, NULL);

 		DestroyTrayMenu(hMenu);

 	}

 	return FALSE;

@@ -2563,20 +2501,20 @@ LRESULT CLUI::OnContextMenu(UINT msg, WPARAM wParam, LPARAM lParam)
 LRESULT CLUI::OnMeasureItem(UINT msg, WPARAM wParam, LPARAM lParam)

 {

 	LPMEASUREITEMSTRUCT pmis = (LPMEASUREITEMSTRUCT)lParam;

-	switch ( pmis->itemData ) {

+	switch (pmis->itemData) {

 	case MENU_MIRANDAMENU:

-		pmis->itemWidth = GetSystemMetrics( SM_CXSMICON ) * 4 / 3;

+		pmis->itemWidth = GetSystemMetrics(SM_CXSMICON) * 4 / 3;

 		pmis->itemHeight = 0;

 		return TRUE;

 

 	case MENU_STATUSMENU:

-		HDC hdc = GetDC( m_hWnd );

+		HDC hdc = GetDC(m_hWnd);

 		TCHAR *ptszStr = TranslateT("Status");

 		SIZE textSize;

 		GetTextExtentPoint32(hdc, ptszStr, lstrlen(ptszStr), &textSize);

 		pmis->itemWidth = textSize.cx;

 		pmis->itemHeight = 0;

-		ReleaseDC( m_hWnd, hdc );

+		ReleaseDC(m_hWnd, hdc);

 		return TRUE;

 	}

 	return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

@@ -2584,7 +2522,7 @@ LRESULT CLUI::OnMeasureItem(UINT msg, WPARAM wParam, LPARAM lParam)
 

 LRESULT CLUI::OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	ClcData *dat = (ClcData*)GetWindowLongPtr(pcli->hwndContactTree,0);

+	ClcData *dat = (ClcData*)GetWindowLongPtr(pcli->hwndContactTree, 0);

 	LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;

 	if (!dat || dis->CtlType != ODT_MENU)

 		return 0;

@@ -2592,76 +2530,77 @@ LRESULT CLUI::OnDrawItem(UINT msg, WPARAM wParam, LPARAM lParam)
 	if (dis->itemData == MENU_MIRANDAMENU) {

 		if (!g_CluiData.fLayered) {

 			char buf[255];

-			short offset = 1 + ( dis->itemState&ODS_SELECTED ? 1 : 0 ) - ( dis->itemState&ODS_HOTLIGHT ? 1 : 0 );

+			short offset = 1 + (dis->itemState&ODS_SELECTED ? 1 : 0) - (dis->itemState&ODS_HOTLIGHT ? 1 : 0);

 

 			HICON hIcon = LoadSkinnedIcon(SKINICON_OTHER_MAINMENU);

 

 			CLUI_DrawMenuBackGround(m_hWnd, dis->hDC, 1, dis->itemState);

-			mir_snprintf(buf,SIZEOF(buf),"Main,ID=MainMenu,Selected=%s,Hot=%s",(dis->itemState&ODS_SELECTED)?"True":"False",(dis->itemState&ODS_HOTLIGHT)?"True":"False");

-			SkinDrawGlyph(dis->hDC,&dis->rcItem,&dis->rcItem,buf);

+			mir_snprintf(buf, SIZEOF(buf), "Main,ID=MainMenu,Selected=%s,Hot=%s", (dis->itemState&ODS_SELECTED) ? "True" : "False", (dis->itemState&ODS_HOTLIGHT) ? "True" : "False");

+			SkinDrawGlyph(dis->hDC, &dis->rcItem, &dis->rcItem, buf);

 

-			int x = (dis->rcItem.right  + dis->rcItem.left - GetSystemMetrics(SM_CXSMICON)) / 2 + offset;

-			int y = (dis->rcItem.bottom + dis->rcItem.top  - GetSystemMetrics(SM_CYSMICON)) / 2 + offset;

+			int x = (dis->rcItem.right + dis->rcItem.left - GetSystemMetrics(SM_CXSMICON)) / 2 + offset;

+			int y = (dis->rcItem.bottom + dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2 + offset;

 

-			DrawState( dis->hDC, NULL, NULL, (LPARAM)hIcon, 0, x, y , 0 , 0 ,

-				DST_ICON | ( dis->itemState & ODS_INACTIVE  && (((FALSE))) ? DSS_DISABLED : DSS_NORMAL ));

+			DrawState(dis->hDC, NULL, NULL, (LPARAM)hIcon, 0, x, y, 0, 0,

+				DST_ICON | (dis->itemState & ODS_INACTIVE && (((FALSE))) ? DSS_DISABLED : DSS_NORMAL));

 

 			Skin_ReleaseIcon(hIcon);

 			nMirMenuState = dis->itemState;

 		}

 		else {

 			nMirMenuState = dis->itemState;

-			pcli->pfnInvalidateRect(m_hWnd,NULL,0);

+			pcli->pfnInvalidateRect(m_hWnd, NULL, 0);

 		}

 		return TRUE;

 	}

 

 	if (dis->itemData == MENU_STATUSMENU) {

 		if (!g_CluiData.fLayered) {

-			char buf[255] = {0};

+			char buf[255] = { 0 };

 			RECT rc = dis->rcItem;

-			short dx = 1+(dis->itemState&ODS_SELECTED?1:0)-(dis->itemState&ODS_HOTLIGHT?1:0);

-			if (dx>1){

+			short dx = 1 + (dis->itemState&ODS_SELECTED ? 1 : 0) - (dis->itemState&ODS_HOTLIGHT ? 1 : 0);

+			if (dx > 1) {

 				rc.left += dx;

 				rc.top += dx;

-			}else if (dx == 0){

+			}

+			else if (dx == 0) {

 				rc.right -= 1;

 				rc.bottom -= 1;

 			}

 			CLUI_DrawMenuBackGround(m_hWnd, dis->hDC, 2, dis->itemState);

-			SetBkMode(dis->hDC,TRANSPARENT);

-			mir_snprintf(buf,SIZEOF(buf),"Main,ID=StatusMenu,Selected=%s,Hot=%s",(dis->itemState&ODS_SELECTED)?"True":"False",(dis->itemState&ODS_HOTLIGHT)?"True":"False");

-			SkinDrawGlyph(dis->hDC,&dis->rcItem,&dis->rcItem,buf);

-			SetTextColor(dis->hDC, (dis->itemState&ODS_SELECTED/*|dis->itemState&ODS_HOTLIGHT*/)?dat->MenuTextHiColor:dat->MenuTextColor);

-			DrawText(dis->hDC,TranslateT("Status"), lstrlen(TranslateT("Status")),&rc, DT_CENTER|DT_VCENTER|DT_SINGLELINE);

+			SetBkMode(dis->hDC, TRANSPARENT);

+			mir_snprintf(buf, SIZEOF(buf), "Main,ID=StatusMenu,Selected=%s,Hot=%s", (dis->itemState&ODS_SELECTED) ? "True" : "False", (dis->itemState&ODS_HOTLIGHT) ? "True" : "False");

+			SkinDrawGlyph(dis->hDC, &dis->rcItem, &dis->rcItem, buf);

+			SetTextColor(dis->hDC, (dis->itemState&ODS_SELECTED/*|dis->itemState&ODS_HOTLIGHT*/) ? dat->MenuTextHiColor : dat->MenuTextColor);

+			DrawText(dis->hDC, TranslateT("Status"), lstrlen(TranslateT("Status")), &rc, DT_CENTER | DT_VCENTER | DT_SINGLELINE);

 			nStatusMenuState = dis->itemState;

 		}

 		else {

 			nStatusMenuState = dis->itemState;

-			pcli->pfnInvalidateRect(m_hWnd,NULL,0);

+			pcli->pfnInvalidateRect(m_hWnd, NULL, 0);

 		}

 		return TRUE;

 	}

 

 	if (dis->itemData == MENU_MINIMIZE && !g_CluiData.fLayered) {

 		//TODO check if caption is visible

-		char buf[255] = {0};

-		short dx = 1+(dis->itemState&ODS_SELECTED?1:0)-(dis->itemState&ODS_HOTLIGHT?1:0);

+		char buf[255] = { 0 };

+		short dx = 1 + (dis->itemState&ODS_SELECTED ? 1 : 0) - (dis->itemState&ODS_HOTLIGHT ? 1 : 0);

 		HICON hIcon = LoadSkinnedIcon(SKINICON_OTHER_MIRANDA);

 		CLUI_DrawMenuBackGround(m_hWnd, dis->hDC, 3, dis->itemState);

-		mir_snprintf(buf,SIZEOF(buf),"Main,ID=MainMenu,Selected=%s,Hot=%s",(dis->itemState&ODS_SELECTED)?"True":"False",(dis->itemState&ODS_HOTLIGHT)?"True":"False");

-		SkinDrawGlyph(dis->hDC,&dis->rcItem,&dis->rcItem,buf);

+		mir_snprintf(buf, SIZEOF(buf), "Main,ID=MainMenu,Selected=%s,Hot=%s", (dis->itemState&ODS_SELECTED) ? "True" : "False", (dis->itemState&ODS_HOTLIGHT) ? "True" : "False");

+		SkinDrawGlyph(dis->hDC, &dis->rcItem, &dis->rcItem, buf);

 		DrawState(dis->hDC, NULL, NULL, (LPARAM)hIcon, 0, (dis->rcItem.right + dis->rcItem.left - GetSystemMetrics(SM_CXSMICON)) / 2 + dx, (dis->rcItem.bottom + dis->rcItem.top - GetSystemMetrics(SM_CYSMICON)) / 2 + dx, 0, 0, DST_ICON);

 		Skin_ReleaseIcon(hIcon);

 		nMirMenuState = dis->itemState;

 	}

 

-	return CallService(MS_CLIST_MENUDRAWITEM,wParam,lParam);

+	return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

 }

 

 LRESULT CLUI::OnDestroy(UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	int state = db_get_b(NULL,"CList","State",SETTING_STATE_NORMAL);

+	int state = db_get_b(NULL, "CList", "State", SETTING_STATE_NORMAL);

 	BOOL wait = FALSE;

 

 	AniAva_UnloadModule();

@@ -2676,8 +2615,7 @@ LRESULT CLUI::OnDestroy(UINT msg, WPARAM wParam, LPARAM lParam)
 	if (gtaWakeThread())

 		wait = TRUE;

 

-	if (wait)

-	{

+	if (wait) {

 		//need to give them a little time to exit.

 		Sleep(50);

 	}

@@ -2686,16 +2624,10 @@ LRESULT CLUI::OnDestroy(UINT msg, WPARAM wParam, LPARAM lParam)
 	while (CLUI_WaitThreadsCompletion(m_hWnd)); //stop all my threads

 	TRACE("CLUI.c: WM_DESTROY - WaitThreadsCompletion DONE\n");

 

-	for (int i=0; i < 64; i++) {

-		PROTOTICKS &p = CycleStartTick[i];

-		if (p.szProto)

-			mir_free_and_nil(p.szProto);

-		if (p.himlIconList)

-			ImageList_Destroy(p.himlIconList);

-	}

+	arTicks.destroy();

 

 	if (state == SETTING_STATE_NORMAL)

-		CLUI_ShowWindowMod(m_hWnd,SW_HIDE);

+		CLUI_ShowWindowMod(m_hWnd, SW_HIDE);

 	UnLoadContactListModule();

 	ClcUnloadModule();

 

@@ -2705,7 +2637,7 @@ LRESULT CLUI::OnDestroy(UINT msg, WPARAM wParam, LPARAM lParam)
 

 	pcli->pfnTrayIconDestroy(m_hWnd);

 	mutex_bAnimationInProgress = 0;

-	CallService(MS_CLIST_FRAMES_REMOVEFRAME,(WPARAM)hFrameContactTree,0);

+	CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)hFrameContactTree, 0);

 	TRACE("CLUI.c: WM_DESTROY - hFrameContactTree removed\n");

 	pcli->hwndContactTree = NULL;

 	pcli->hwndStatus = NULL;

@@ -2713,18 +2645,18 @@ LRESULT CLUI::OnDestroy(UINT msg, WPARAM wParam, LPARAM lParam)
 	if (g_CluiData.fAutoSize && !g_CluiData.fDocked) {

 		RECT r;

 		GetWindowRect(pcli->hwndContactList, &r);

-		if ( db_get_b(NULL,"CLUI","AutoSizeUpward",SETTING_AUTOSIZEUPWARD_DEFAULT))

-			r.top = r.bottom-CLUIFrames_GetTotalHeight();

+		if (db_get_b(NULL, "CLUI", "AutoSizeUpward", SETTING_AUTOSIZEUPWARD_DEFAULT))

+			r.top = r.bottom - CLUIFrames_GetTotalHeight();

 		else

-			r.bottom = r.top+CLUIFrames_GetTotalHeight();

-		db_set_dw(NULL,"CList","y",r.top);

-		db_set_dw(NULL,"CList","Height",r.bottom-r.top);

+			r.bottom = r.top + CLUIFrames_GetTotalHeight();

+		db_set_dw(NULL, "CList", "y", r.top);

+		db_set_dw(NULL, "CList", "Height", r.bottom - r.top);

 	}

 

 	UnLoadCLUIFramesModule();

 	//ExtFrames_Uninit();

 	TRACE("CLUI.c: WM_DESTROY - UnLoadCLUIFramesModule DONE\n");

-	db_set_b(NULL,"CList","State",(BYTE)state);

+	db_set_b(NULL, "CList", "State", (BYTE)state);

 	ske_UnloadSkin(&g_SkinObjectList);

 

 	delete m_pCLUI;