fixes for the MCONTACTs, stored in the database

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

1 files changed, 186 insertions, 191 deletions

diff --git a/plugins/DbEditorPP/src/main_window.cpp b/plugins/DbEditorPP/src/main_window.cpp
index efdf5599ec..0406d5fe11 100644
--- a/plugins/DbEditorPP/src/main_window.cpp
+++ b/plugins/DbEditorPP/src/main_window.cpp
@@ -9,54 +9,54 @@ int Hex;
 

 extern BOOL bServiceMode;

 

-void moduleListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam);

-void SettingsListWM_NOTIFY(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam);

+void moduleListWM_NOTIFY(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

+void SettingsListWM_NOTIFY(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam);

 

-int DialogResize(HWND hwnd,LPARAM lParam,UTILRESIZECONTROL *urc)

+int DialogResize(HWND hwnd, LPARAM lParam, UTILRESIZECONTROL *urc)

 {

-	switch(urc->wId) {

+	switch (urc->wId) {

 	case IDC_MODULES:

-		urc->rcItem.right = lParam-3;

+		urc->rcItem.right = lParam - 3;

 		urc->rcItem.top = 0;

 		urc->rcItem.left = 0;

 		urc->rcItem.bottom = urc->dlgNewSize.cy;

-		return RD_ANCHORX_CUSTOM|RD_ANCHORY_CUSTOM;

+		return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM;

 

 	case IDC_SPLITTER:

 		urc->rcItem.top = 0;

 		urc->rcItem.bottom = urc->dlgNewSize.cy;

 		urc->rcItem.right = lParam;

-		urc->rcItem.left =  lParam-3;

-		return RD_ANCHORX_CUSTOM|RD_ANCHORY_CUSTOM;

+		urc->rcItem.left = lParam - 3;

+		return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM;

 

 	case IDC_SETTINGS:

 		urc->rcItem.top = 0;

 		urc->rcItem.bottom = urc->dlgNewSize.cy;

 		urc->rcItem.left = lParam;

 		urc->rcItem.right = urc->dlgNewSize.cx;

-		return RD_ANCHORX_CUSTOM|RD_ANCHORY_CUSTOM;

+		return RD_ANCHORX_CUSTOM | RD_ANCHORY_CUSTOM;

 

 	case IDC_VARS:

 		urc->rcItem.top = 0;

 		urc->rcItem.bottom = urc->dlgNewSize.cy;

 		urc->rcItem.left = 0;

 		urc->rcItem.right = urc->dlgNewSize.cx;

-		return RD_ANCHORY_CUSTOM|RD_ANCHORX_CUSTOM;

+		return RD_ANCHORY_CUSTOM | RD_ANCHORX_CUSTOM;

 	}

-	return RD_ANCHORX_LEFT|RD_ANCHORY_TOP;

+	return RD_ANCHORX_LEFT | RD_ANCHORY_TOP;

 }

 

-static LRESULT CALLBACK SplitterSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)

+static LRESULT CALLBACK SplitterSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch(msg) {

+	switch (msg) {

 	case WM_NCHITTEST:

 		return HTCLIENT;

 

 	case WM_SETCURSOR:

 		{

 			RECT rc;

-			GetClientRect(hwnd,&rc);

-			SetCursor(rc.right>rc.bottom?LoadCursor(NULL, IDC_SIZENS):LoadCursor(NULL, IDC_SIZEWE));

+			GetClientRect(hwnd, &rc);

+			SetCursor(rc.right > rc.bottom ? LoadCursor(NULL, IDC_SIZENS) : LoadCursor(NULL, IDC_SIZEWE));

 		}

 		return TRUE;

 

@@ -65,10 +65,10 @@ static LRESULT CALLBACK SplitterSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LP
 		return 0;

 

 	case WM_MOUSEMOVE:

-		if(GetCapture()==hwnd) {

+		if (GetCapture() == hwnd) {

 			RECT rc;

-			GetClientRect(hwnd,&rc);

-			SendMessage(GetParent(hwnd),GC_SPLITTERMOVED,rc.right>rc.bottom?(short)HIWORD(GetMessagePos())+rc.bottom/2:(short)LOWORD(GetMessagePos())+rc.right/2,(LPARAM)hwnd);

+			GetClientRect(hwnd, &rc);

+			SendMessage(GetParent(hwnd), GC_SPLITTERMOVED, rc.right > rc.bottom ? (short)HIWORD(GetMessagePos()) + rc.bottom / 2 : (short)LOWORD(GetMessagePos()) + rc.right / 2, (LPARAM)hwnd);

 		}

 		return 0;

 

@@ -80,26 +80,25 @@ static LRESULT CALLBACK SplitterSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LP
 	return mir_callNextSubclass(hwnd, SplitterSubclassProc, msg, wParam, lParam);

 }

 

-LRESULT CALLBACK ModuleTreeSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)

+LRESULT CALLBACK ModuleTreeSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch(msg) {

+	switch (msg) {

 	case WM_RBUTTONDOWN:

 		{

 			TVHITTESTINFO hti;

-			hti.pt.x=(short)LOWORD(GetMessagePos());

-			hti.pt.y=(short)HIWORD(GetMessagePos());

-			ScreenToClient(hwnd,&hti.pt);

+			hti.pt.x = (short)LOWORD(GetMessagePos());

+			hti.pt.y = (short)HIWORD(GetMessagePos());

+			ScreenToClient(hwnd, &hti.pt);

 

-			if(TreeView_HitTest(hwnd,&hti))

-			{

-				if(hti.flags&TVHT_ONITEM)

+			if (TreeView_HitTest(hwnd, &hti)) {

+				if (hti.flags&TVHT_ONITEM)

 					TreeView_SelectItem(hwnd, hti.hItem);

 			}

 		}

 		break;

 

 	case WM_CHAR:

-		if (GetKeyState(VK_CONTROL)&0x8000 && wParam == 6)

+		if (GetKeyState(VK_CONTROL) & 0x8000 && wParam == 6)

 			CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIND), hwnd, FindWindowDlgProc);

 		break;

 

@@ -107,34 +106,34 @@ LRESULT CALLBACK ModuleTreeSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM
 		if (wParam == VK_DELETE || wParam == VK_F2 || wParam == VK_F5 || wParam == VK_F3) {

 			TVITEM tvi;

 			char module[256];

-			tvi.mask=TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;

-			tvi.hItem=TreeView_GetSelection(hwnd);

+			tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT;

+			tvi.hItem = TreeView_GetSelection(hwnd);

 			tvi.pszText = module;

 			tvi.cchTextMax = 255;

-			if (TreeView_GetItem(hwnd,&tvi) && tvi.lParam) {

+			if (TreeView_GetItem(hwnd, &tvi) && tvi.lParam) {

 				ModuleTreeInfoStruct *mtis = (ModuleTreeInfoStruct*)tvi.lParam;

 				MCONTACT hContact = mtis->hContact;

 				if (wParam == VK_DELETE) {

 					if ((mtis->type) & MODULE) {

-						if (deleteModule(module, hContact,0)) {

+						if (deleteModule(module, hContact, 0)) {

 							mir_free(mtis);

-							TreeView_DeleteItem(hwnd,tvi.hItem);

+							TreeView_DeleteItem(hwnd, tvi.hItem);

 						}

 					}

 					else if ((mtis->type == CONTACT) && hContact) {

-						if (db_get_b(NULL,"CList", "ConfirmDelete",1)) {

+						if (db_get_b(NULL, "CList", "ConfirmDelete", 1)) {

 							char msg[1024];

 							mir_snprintf(msg, SIZEOF(msg), Translate("Are you sure you want to delete contact \"%s\"?"), module);

-							if (MessageBox(0,msg, Translate("Confirm Contact Delete"), MB_YESNO|MB_ICONEXCLAMATION) == IDNO)

+							if (MessageBox(0, msg, Translate("Confirm Contact Delete"), MB_YESNO | MB_ICONEXCLAMATION) == IDNO)

 								break;

 						}

-						CallService(MS_DB_CONTACT_DELETE, hContact,0);

-						freeTree(hwnd,mtis->hContact);

-						TreeView_DeleteItem(hwnd,tvi.hItem);

+						CallService(MS_DB_CONTACT_DELETE, hContact, 0);

+						freeTree(hwnd, mtis->hContact);

+						TreeView_DeleteItem(hwnd, tvi.hItem);

 					}

 				}

 				else if (wParam == VK_F2 && mtis->type == MODULE)

-					TreeView_EditLabel(hwnd,tvi.hItem);

+					TreeView_EditLabel(hwnd, tvi.hItem);

 				else if (wParam == VK_F5) {

 					refreshTree(1);

 					break;

@@ -150,11 +149,11 @@ LRESULT CALLBACK ModuleTreeSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM
 	return mir_callNextSubclass(hwnd, ModuleTreeSubclassProc, msg, wParam, lParam);

 }

 

-static LRESULT CALLBACK SettingListSubclassProc(HWND hwnd,UINT msg,WPARAM wParam,LPARAM lParam)

+static LRESULT CALLBACK SettingListSubclassProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch(msg) {

+	switch (msg) {

 	case WM_CHAR:

-		if (GetKeyState(VK_CONTROL)&0x8000 && wParam == 6)

+		if (GetKeyState(VK_CONTROL) & 0x8000 && wParam == 6)

 			CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIND), hwnd, FindWindowDlgProc);

 		break;

 

@@ -162,17 +161,17 @@ static LRESULT CALLBACK SettingListSubclassProc(HWND hwnd,UINT msg,WPARAM wParam
 		if (wParam == VK_DELETE || wParam == VK_F5 || (wParam == VK_F2 && ListView_GetSelectedCount(hwnd) == 1)) {

 			char *module, setting[256];

 			MCONTACT hContact;

-			SettingListInfo* sli = (SettingListInfo*)GetWindowLongPtr(hwnd,GWLP_USERDATA);

+			SettingListInfo* sli = (SettingListInfo*)GetWindowLongPtr(hwnd, GWLP_USERDATA);

 			if (!sli) break;

 			hContact = sli->hContact;

 			module = sli->module;

 			ListView_GetItemText(hwnd, ListView_GetSelectionMark(hwnd), 0, setting, 256);

 

 			if (wParam == VK_F2)

-				editSetting(hContact,module, setting);

+				editSetting(hContact, module, setting);

 			else if (wParam == VK_F5) {

 				char *szModule = mir_tstrdup(module); // need to do this, otheriwse the setlist stays empty

-				PopulateSettings(hwnd,hContact,szModule);

+				PopulateSettings(hwnd, hContact, szModule);

 				mir_free(szModule);

 			}

 			else if (wParam == VK_DELETE)

@@ -189,55 +188,55 @@ static LRESULT CALLBACK SettingListSubclassProc(HWND hwnd,UINT msg,WPARAM wParam
 

 INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)

 {

-	switch(msg) {

+	switch (msg) {

 	case WM_INITDIALOG:

 		TranslateDialogDefault(hwnd);

 		{

 			hwnd2mainWindow = hwnd;

 			// do the icon

-			SendMessage(hwnd,WM_SETICON,ICON_BIG,(LPARAM)LoadIcon(hInst,MAKEINTRESOURCE(ICO_REGEDIT)));

+			SendMessage(hwnd, WM_SETICON, ICON_BIG, (LPARAM)LoadIcon(hInst, MAKEINTRESOURCE(ICO_REGEDIT)));

 			SetWindowText(hwnd, TranslateT("Database Editor++"));

 

 			// setup the splitter

-			SetWindowLongPtr(GetDlgItem(hwnd,IDC_SPLITTER),GWLP_USERDATA,(LPARAM)db_get_w(NULL, modname, "Splitter", 300));

-			SendMessage(hwnd, GC_SPLITTERMOVED, 0,0);

-			mir_subclassWindow(GetDlgItem(hwnd,IDC_SPLITTER), SplitterSubclassProc);

+			SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, (LPARAM)db_get_w(NULL, modname, "Splitter", 300));

+			SendMessage(hwnd, GC_SPLITTERMOVED, 0, 0);

+			mir_subclassWindow(GetDlgItem(hwnd, IDC_SPLITTER), SplitterSubclassProc);

 			// module tree

-			TreeView_SetUnicodeFormat(GetDlgItem(hwnd,IDC_MODULES), TRUE);

-			mir_subclassWindow(GetDlgItem(hwnd,IDC_MODULES), ModuleTreeSubclassProc);

+			TreeView_SetUnicodeFormat(GetDlgItem(hwnd, IDC_MODULES), TRUE);

+			mir_subclassWindow(GetDlgItem(hwnd, IDC_MODULES), ModuleTreeSubclassProc);

 			//setting list

-			setupSettingsList(GetDlgItem(hwnd,IDC_SETTINGS));

-			mir_subclassWindow(GetDlgItem(hwnd,IDC_SETTINGS), SettingListSubclassProc);

+			setupSettingsList(GetDlgItem(hwnd, IDC_SETTINGS));

+			mir_subclassWindow(GetDlgItem(hwnd, IDC_SETTINGS), SettingListSubclassProc);

 

 			HMENU hMenu = GetMenu(hwnd);

 			TranslateMenu(hMenu);

-			for (int i=0; i < 6; i++)

-				TranslateMenu(GetSubMenu(hMenu,i));

+			for (int i = 0; i < 6; i++)

+				TranslateMenu(GetSubMenu(hMenu, i));

 

 			// move the dialog to the users position

-			MoveWindow(hwnd,db_get_dw(NULL,modname,"x",0),db_get_dw(NULL,modname,"y",0),db_get_dw(NULL,modname,"width",500),db_get_dw(NULL,modname,"height",250),0);

-			if (db_get_b(NULL,modname,"Maximised",0)) {

+			MoveWindow(hwnd, db_get_dw(NULL, modname, "x", 0), db_get_dw(NULL, modname, "y", 0), db_get_dw(NULL, modname, "width", 500), db_get_dw(NULL, modname, "height", 250), 0);

+			if (db_get_b(NULL, modname, "Maximised", 0)) {

 				WINDOWPLACEMENT wp;

 				wp.length = sizeof(WINDOWPLACEMENT);

 				wp.flags = WPF_RESTORETOMAXIMIZED;

 				wp.showCmd = SW_SHOWMAXIMIZED;

 

-				SetWindowPlacement(hwnd,&wp);

+				SetWindowPlacement(hwnd, &wp);

 			}

-			SetCursor(LoadCursor(NULL,IDC_ARROW));

+			SetCursor(LoadCursor(NULL, IDC_ARROW));

 

 			Mode = MODE_ALL;

-			CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_ALL,MF_BYCOMMAND|MF_CHECKED);

+			CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_ALL, MF_BYCOMMAND | MF_CHECKED);

 

-			Hex = db_get_b(NULL,modname,"HexMode",0);

-			CheckMenuItem(GetSubMenu(hMenu,5),MENU_BYTE_HEX,MF_BYCOMMAND|((Hex & HEX_BYTE)?MF_CHECKED:MF_UNCHECKED));

-			CheckMenuItem(GetSubMenu(hMenu,5),MENU_WORD_HEX,MF_BYCOMMAND|((Hex & HEX_WORD)?MF_CHECKED:MF_UNCHECKED));

-			CheckMenuItem(GetSubMenu(hMenu,5),MENU_DWORD_HEX,MF_BYCOMMAND|((Hex & HEX_DWORD)?MF_CHECKED:MF_UNCHECKED));

+			Hex = db_get_b(NULL, modname, "HexMode", 0);

+			CheckMenuItem(GetSubMenu(hMenu, 5), MENU_BYTE_HEX, MF_BYCOMMAND | ((Hex & HEX_BYTE) ? MF_CHECKED : MF_UNCHECKED));

+			CheckMenuItem(GetSubMenu(hMenu, 5), MENU_WORD_HEX, MF_BYCOMMAND | ((Hex & HEX_WORD) ? MF_CHECKED : MF_UNCHECKED));

+			CheckMenuItem(GetSubMenu(hMenu, 5), MENU_DWORD_HEX, MF_BYCOMMAND | ((Hex & HEX_DWORD) ? MF_CHECKED : MF_UNCHECKED));

 

-			CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SAVE_POSITION,MF_BYCOMMAND|(db_get_b(NULL,modname,"RestoreOnOpen",1)?MF_CHECKED:MF_UNCHECKED));

+			CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SAVE_POSITION, MF_BYCOMMAND | (db_get_b(NULL, modname, "RestoreOnOpen", 1) ? MF_CHECKED : MF_UNCHECKED));

 

-			Order = db_get_b(NULL,modname,"SortMode",1);

-			CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SORT_ORDER,MF_BYCOMMAND|(Order?MF_CHECKED:MF_UNCHECKED));

+			Order = db_get_b(NULL, modname, "SortMode", 1);

+			CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SORT_ORDER, MF_BYCOMMAND | (Order ? MF_CHECKED : MF_UNCHECKED));

 

 			// image list

 			int numberOfIcons = 0;

@@ -294,7 +293,7 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			int restore;

 			if (hRestore)

 				restore = 3;

-			else if (db_get_b(NULL,modname,"RestoreOnOpen",1))

+			else if (db_get_b(NULL, modname, "RestoreOnOpen", 1))

 				restore = 2;

 			else

 				restore = 0;

@@ -305,92 +304,92 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 

 	case GC_SPLITTERMOVED:

 		{

-			POINT pt;

-			RECT rc;

-			RECT rc2;

-

-			int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd,IDC_SPLITTER),GWLP_USERDATA);

-

-			GetWindowRect(hwnd,&rc2);

+			int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

 

-			if ((HWND)lParam==GetDlgItem(hwnd,IDC_SPLITTER))

-			{

-				GetClientRect(hwnd,&rc);

-				pt.x=wParam; pt.y=0;

-				ScreenToClient(hwnd,&pt);

-

-				splitterPos=rc.left+pt.x+1;

-				if (splitterPos<65) splitterPos=65;

-				if (splitterPos > rc2.right-rc2.left-65) splitterPos=rc2.right-rc2.left-65;

-				SetWindowLongPtr(GetDlgItem(hwnd,IDC_SPLITTER),GWLP_USERDATA, splitterPos);

-				db_set_w(NULL, modname, "Splitter",(WORD)splitterPos);

+			RECT rc2;

+			GetWindowRect(hwnd, &rc2);

+

+			if ((HWND)lParam == GetDlgItem(hwnd, IDC_SPLITTER)) {

+				RECT rc;

+				GetClientRect(hwnd, &rc);

+				POINT pt = { wParam, 0 };

+				ScreenToClient(hwnd, &pt);

+

+				splitterPos = rc.left + pt.x + 1;

+				if (splitterPos<65) splitterPos = 65;

+				if (splitterPos > rc2.right - rc2.left - 65) splitterPos = rc2.right - rc2.left - 65;

+				SetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA, splitterPos);

+				db_set_w(NULL, modname, "Splitter", (WORD)splitterPos);

 			}

-			PostMessage(hwnd,WM_SIZE,0,0);

+			PostMessage(hwnd, WM_SIZE, 0, 0);

 		}

 		break;

+

 	case WM_GETMINMAXINFO:

 		{

-			MINMAXINFO *mmi=(MINMAXINFO*)lParam;

-			int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd,IDC_SPLITTER),GWLP_USERDATA);

+			MINMAXINFO *mmi = (MINMAXINFO*)lParam;

+			int splitterPos = GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

 

-			if(splitterPos+40 > 200)

-				mmi->ptMinTrackSize.x=splitterPos+65;

+			if (splitterPos + 40 > 200)

+				mmi->ptMinTrackSize.x = splitterPos + 65;

 			else

-				mmi->ptMinTrackSize.x=200;

-			mmi->ptMinTrackSize.y=150;

-			return 0;

+				mmi->ptMinTrackSize.x = 200;

+			mmi->ptMinTrackSize.y = 150;

 		}

+		return 0;

+

 	case WM_MOVE:

 	case WM_SIZE:

 		{

 			UTILRESIZEDIALOG urd;

 

-			ZeroMemory(&urd,sizeof(urd));

-			urd.cbSize=sizeof(urd);

-			urd.hInstance=hInst;

-			urd.hwndDlg=hwnd;

-			urd.lParam=(LPARAM)GetWindowLongPtr(GetDlgItem(hwnd,IDC_SPLITTER),GWLP_USERDATA);

-			urd.lpTemplate=MAKEINTRESOURCE(IDD_MAIN);

-			urd.pfnResizer=DialogResize;

-			CallService(MS_UTILS_RESIZEDIALOG,0,(LPARAM)&urd);

+			ZeroMemory(&urd, sizeof(urd));

+			urd.cbSize = sizeof(urd);

+			urd.hInstance = hInst;

+			urd.hwndDlg = hwnd;

+			urd.lParam = (LPARAM)GetWindowLongPtr(GetDlgItem(hwnd, IDC_SPLITTER), GWLP_USERDATA);

+			urd.lpTemplate = MAKEINTRESOURCE(IDD_MAIN);

+			urd.pfnResizer = DialogResize;

+			CallService(MS_UTILS_RESIZEDIALOG, 0, (LPARAM)&urd);

 

 			if (msg == WM_SIZE && wParam == SIZE_MAXIMIZED || wParam == SIZE_MINIMIZED)

-				db_set_b(NULL,modname,"Maximised",1);

+				db_set_b(NULL, modname, "Maximised", 1);

 			else if (msg == WM_SIZE && wParam == SIZE_RESTORED)

-				db_set_b(NULL,modname,"Maximised",0);

+				db_set_b(NULL, modname, "Maximised", 0);

 		}

 		break;

 

 	case WM_DESTROY: // free our shit!

-		if (db_get_b(NULL,modname,"RestoreOnOpen",1)) {

+		if (db_get_b(NULL, modname, "RestoreOnOpen", 1)) {

 			HTREEITEM item;

-			HWND hwnd2Tree = GetDlgItem(hwnd,IDC_MODULES);

-			char module[256] = {0};

+			HWND hwnd2Tree = GetDlgItem(hwnd, IDC_MODULES);

+			char module[256] = { 0 };

 			if (item = TreeView_GetSelection(hwnd2Tree)) {

 				int type = MODULE;

-				TVITEM tvi = {0};

-				MCONTACT hContact = NULL;

-				tvi.mask=TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;

+

+				TVITEM tvi = { 0 };

+				tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT;

 				tvi.pszText = module;

 				tvi.cchTextMax = 255;

-				tvi.hItem=item;

+				tvi.hItem = item;

 				if (TreeView_GetItem(hwnd2Tree, &tvi)) {

+					MCONTACT hContact = 0;

 					if (tvi.lParam) {

 						ModuleTreeInfoStruct *mtis = (ModuleTreeInfoStruct *)tvi.lParam;

 						hContact = mtis->hContact;

 						type = mtis->type;

 					}

 

-					db_set_dw(NULL,modname,"LastContact",(DWORD)hContact);

+					db_set_dw(NULL, modname, "LastContact", hContact);

 

 					if (type == CONTACT)

-						db_set_s(NULL,modname,"LastModule","");

+						db_set_s(NULL, modname, "LastModule", "");

 					else

-						db_set_s(NULL,modname,"LastModule",module);

+						db_set_s(NULL, modname, "LastModule", module);

 				}

 				else {

-					db_unset(NULL,modname,"LastContact");

-					db_unset(NULL,modname,"LastModule");

+					db_unset(NULL, modname, "LastContact");

+					db_unset(NULL, modname, "LastModule");

 				}

 

 				HWND hwnd2Settings = GetDlgItem(hwnd, IDC_SETTINGS);

@@ -399,29 +398,29 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 				if (pos != -1) {

 					char text[256];

 					ListView_GetItemText(hwnd2Settings, pos, 0, text, SIZEOF(text));

-					db_set_s(NULL,modname,"LastSetting",text);

+					db_set_s(NULL, modname, "LastSetting", text);

 				}

-				else db_unset(NULL,modname,"LastSetting");

+				else db_unset(NULL, modname, "LastSetting");

 			}

 		}

-		db_set_b(NULL,modname,"HexMode",(byte)Hex);

-		db_set_b(NULL,modname,"SortMode",(byte)Order);

-		saveListSettings(GetDlgItem(hwnd,IDC_SETTINGS));

+		db_set_b(NULL, modname, "HexMode", (byte)Hex);

+		db_set_b(NULL, modname, "SortMode", (byte)Order);

+		saveListSettings(GetDlgItem(hwnd, IDC_SETTINGS));

 		hwnd2mainWindow = 0;

-		ClearListview(GetDlgItem(hwnd,IDC_SETTINGS));

-		freeTree(GetDlgItem(hwnd,IDC_MODULES),0);

+		ClearListview(GetDlgItem(hwnd, IDC_SETTINGS));

+		freeTree(GetDlgItem(hwnd, IDC_MODULES), 0);

 		if (himl)

 			ImageList_Destroy(himl);

 		if (himl2)

 			ImageList_Destroy(himl2);

 

-		if (!db_get_b(NULL,modname,"Maximised",0)) {

+		if (!db_get_b(NULL, modname, "Maximised", 0)) {

 			RECT rc;

-			GetWindowRect(hwnd,&rc);

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

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

-			db_set_dw(NULL,modname,"width",rc.right-rc.left);

-			db_set_dw(NULL,modname,"height",rc.bottom-rc.top);

+			GetWindowRect(hwnd, &rc);

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

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

+			db_set_dw(NULL, modname, "width", rc.right - rc.left);

+			db_set_dw(NULL, modname, "height", rc.bottom - rc.top);

 		}

 

 		if (hwnd2importWindow) {

@@ -429,36 +428,35 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			hwnd2importWindow = 0;

 		}

 

-		if ( bServiceMode )

+		if (bServiceMode)

 			PostQuitMessage(0);

 		return 0;

 

 	case WM_COMMAND:

 		if (GetKeyState(VK_ESCAPE) & 0x8000) return TRUE; // this needs to be changed to c if htere is a label edit happening..

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case MENU_REFRESH_MODS:

 			refreshTree(1);

 			break;

 

 		case MENU_REFRESH_SETS:

-			{

-				TVITEM tvi;

-				ModuleTreeInfoStruct *mtis;

-				char module[256];

-				tvi.mask=TVIF_HANDLE|TVIF_PARAM|TVIF_TEXT;

-				tvi.hItem=TreeView_GetSelection(GetDlgItem(hwnd, IDC_MODULES));

-				tvi.pszText = module;

-				tvi.cchTextMax = 255;

-				if (!TreeView_GetItem(GetDlgItem(hwnd, IDC_MODULES),&tvi)) break;

-				if (tvi.lParam)

-				{

-					mtis = (ModuleTreeInfoStruct *)tvi.lParam;

-					if (mtis->type  == MODULE)

-						PopulateSettings(GetDlgItem(hwnd, IDC_SETTINGS), mtis->hContact, module);

-					else ClearListview(GetDlgItem(hwnd, IDC_SETTINGS));

-				}

+		{

+			TVITEM tvi;

+			ModuleTreeInfoStruct *mtis;

+			char module[256];

+			tvi.mask = TVIF_HANDLE | TVIF_PARAM | TVIF_TEXT;

+			tvi.hItem = TreeView_GetSelection(GetDlgItem(hwnd, IDC_MODULES));

+			tvi.pszText = module;

+			tvi.cchTextMax = 255;

+			if (!TreeView_GetItem(GetDlgItem(hwnd, IDC_MODULES), &tvi)) break;

+			if (tvi.lParam) {

+				mtis = (ModuleTreeInfoStruct *)tvi.lParam;

+				if (mtis->type == MODULE)

+					PopulateSettings(GetDlgItem(hwnd, IDC_SETTINGS), mtis->hContact, module);

 				else ClearListview(GetDlgItem(hwnd, IDC_SETTINGS));

 			}

+			else ClearListview(GetDlgItem(hwnd, IDC_SETTINGS));

+		}

 			break;

 			///////////////////////// // watches

 		case MENU_VIEW_WATCHES:

@@ -495,12 +493,11 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 			CreateDialog(hInst, MAKEINTRESOURCE(IDD_FIND), hwnd, FindWindowDlgProc);

 			break;

 		case MENU_FILTER_ALL:

-			if (Mode != MODE_ALL)

-			{

+			if (Mode != MODE_ALL) {

 				HMENU hMenu = GetMenu(hwnd);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_ALL,MF_BYCOMMAND|MF_CHECKED);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_LOADED,MF_BYCOMMAND|MF_UNCHECKED);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_UNLOADED,MF_BYCOMMAND|MF_UNCHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_ALL, MF_BYCOMMAND | MF_CHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_LOADED, MF_BYCOMMAND | MF_UNCHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_UNLOADED, MF_BYCOMMAND | MF_UNCHECKED);

 				Mode = MODE_ALL;

 				refreshTree(1);

 			}

@@ -508,9 +505,9 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		case MENU_FILTER_LOADED:

 			if (Mode != MODE_LOADED) {

 				HMENU hMenu = GetMenu(hwnd);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_ALL,MF_BYCOMMAND|MF_UNCHECKED);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_LOADED,MF_BYCOMMAND|MF_CHECKED);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_UNLOADED,MF_BYCOMMAND|MF_UNCHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_ALL, MF_BYCOMMAND | MF_UNCHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_LOADED, MF_BYCOMMAND | MF_CHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_UNLOADED, MF_BYCOMMAND | MF_UNCHECKED);

 				Mode = MODE_LOADED;

 				refreshTree(1);

 			}

@@ -518,39 +515,39 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		case MENU_FILTER_UNLOADED:

 			if (Mode != MODE_UNLOADED) {

 				HMENU hMenu = GetMenu(hwnd);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_ALL,MF_BYCOMMAND|MF_UNCHECKED);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_LOADED,MF_BYCOMMAND|MF_UNCHECKED);

-				CheckMenuItem(GetSubMenu(hMenu,5),MENU_FILTER_UNLOADED,MF_BYCOMMAND|MF_CHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_ALL, MF_BYCOMMAND | MF_UNCHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_LOADED, MF_BYCOMMAND | MF_UNCHECKED);

+				CheckMenuItem(GetSubMenu(hMenu, 5), MENU_FILTER_UNLOADED, MF_BYCOMMAND | MF_CHECKED);

 				Mode = MODE_UNLOADED;

 				refreshTree(1);

 			}

 			break;

 		case MENU_BYTE_HEX:

 			Hex ^= HEX_BYTE;

-			CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_BYTE_HEX,MF_BYCOMMAND|((Hex & HEX_BYTE)?MF_CHECKED:MF_UNCHECKED));

+			CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_BYTE_HEX, MF_BYCOMMAND | ((Hex & HEX_BYTE) ? MF_CHECKED : MF_UNCHECKED));

 			break;

 		case MENU_WORD_HEX:

 			Hex ^= HEX_WORD;

-			CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_WORD_HEX,MF_BYCOMMAND|((Hex & HEX_WORD)?MF_CHECKED:MF_UNCHECKED));

+			CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_WORD_HEX, MF_BYCOMMAND | ((Hex & HEX_WORD) ? MF_CHECKED : MF_UNCHECKED));

 			break;

 		case MENU_DWORD_HEX:

 			Hex ^= HEX_DWORD;

-			CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_DWORD_HEX,MF_BYCOMMAND|((Hex & HEX_DWORD)?MF_CHECKED:MF_UNCHECKED));

+			CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_DWORD_HEX, MF_BYCOMMAND | ((Hex & HEX_DWORD) ? MF_CHECKED : MF_UNCHECKED));

 			break;

 		case MENU_SAVE_POSITION:

-			{

-				BOOL save = !db_get_b(NULL,modname,"RestoreOnOpen",1);

-				CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SAVE_POSITION,MF_BYCOMMAND|(save?MF_CHECKED:MF_UNCHECKED));

-				db_set_b(NULL,modname,"RestoreOnOpen", (byte)save);

-			}

+		{

+			BOOL save = !db_get_b(NULL, modname, "RestoreOnOpen", 1);

+			CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SAVE_POSITION, MF_BYCOMMAND | (save ? MF_CHECKED : MF_UNCHECKED));

+			db_set_b(NULL, modname, "RestoreOnOpen", (byte)save);

+		}

 			break;

 		case MENU_SORT_ORDER:

 			Order = !Order;

-			CheckMenuItem(GetSubMenu(GetMenu(hwnd),5),MENU_SORT_ORDER,MF_BYCOMMAND|(Order?MF_CHECKED:MF_UNCHECKED));

+			CheckMenuItem(GetSubMenu(GetMenu(hwnd), 5), MENU_SORT_ORDER, MF_BYCOMMAND | (Order ? MF_CHECKED : MF_UNCHECKED));

 			refreshTree(1);

 			break;

 		case MENU_OPEN_OPTIONS:

-			OPENOPTIONSDIALOG odp = {0};

+			OPENOPTIONSDIALOG odp = { 0 };

 			odp.cbSize = sizeof(odp);

 			odp.pszGroup = "Database";

 			odp.pszPage = modFullname;

@@ -561,37 +558,35 @@ INT_PTR CALLBACK MainDlgProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 		return TRUE; // case WM_COMMAND

 

 	case WM_NOTIFY:

-		switch(LOWORD(wParam)) {

+		switch (LOWORD(wParam)) {

 		case IDC_MODULES:

-			moduleListWM_NOTIFY(hwnd,msg,wParam,lParam);

+			moduleListWM_NOTIFY(hwnd, msg, wParam, lParam);

 			break;

 		case IDC_SETTINGS:

-			SettingsListWM_NOTIFY(hwnd,msg,wParam,lParam);

+			SettingsListWM_NOTIFY(hwnd, msg, wParam, lParam);

 			break;

 		}

 		return TRUE; // case WM_NOTIFY

 

 	case WM_FINDITEM:

-		{

-			ItemInfo *ii = (ItemInfo*)wParam;

-			HWND hwnd2Settings = GetDlgItem(hwnd,IDC_SETTINGS);

-			int hItem = findItemInTree(GetDlgItem(hwnd,IDC_MODULES),ii->hContact,ii->module);

-			if (hItem != -1) {

-				TreeView_SelectItem(GetDlgItem(hwnd,IDC_MODULES), (HTREEITEM)hItem);

-				if (ii->type != FW_MODULE) {

-					LVITEM lvItem;

-					LVFINDINFO lvfi;

-

-					lvfi.flags = LVFI_STRING;

-					lvfi.psz = ii->setting;

-					lvfi.vkDirection = VK_DOWN;

-

-					lvItem.mask = LVIF_TEXT|LVIF_IMAGE;

-					lvItem.iItem = ListView_FindItem(hwnd2Settings,-1,&lvfi);

-					lvItem.iSubItem = 0;

-					if (lvItem.iItem >= 0)

-						ListView_SetItemState(hwnd2Settings,lvItem.iItem, LVIS_SELECTED, LVIS_SELECTED);

-				}

+		ItemInfo *ii = (ItemInfo*)wParam;

+		HWND hwnd2Settings = GetDlgItem(hwnd, IDC_SETTINGS);

+		int hItem = findItemInTree(GetDlgItem(hwnd, IDC_MODULES), ii->hContact, ii->module);

+		if (hItem != -1) {

+			TreeView_SelectItem(GetDlgItem(hwnd, IDC_MODULES), (HTREEITEM)hItem);

+			if (ii->type != FW_MODULE) {

+				LVITEM lvItem;

+				LVFINDINFO lvfi;

+

+				lvfi.flags = LVFI_STRING;

+				lvfi.psz = ii->setting;

+				lvfi.vkDirection = VK_DOWN;

+

+				lvItem.mask = LVIF_TEXT | LVIF_IMAGE;

+				lvItem.iItem = ListView_FindItem(hwnd2Settings, -1, &lvfi);

+				lvItem.iSubItem = 0;

+				if (lvItem.iItem >= 0)

+					ListView_SetItemState(hwnd2Settings, lvItem.iItem, LVIS_SELECTED, LVIS_SELECTED);

 			}

 		}

 		break;