- all MS_CLIST_ADD*ITEM services replaced with Menu_Add*Item stubs.

- massive cleanup of the menu-related code

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

1 files changed, 76 insertions, 76 deletions

diff --git a/src/modules/visibility/visibility.cpp b/src/modules/visibility/visibility.cpp
index 5d5719bfd7..f3b581947c 100644
--- a/src/modules/visibility/visibility.cpp
+++ b/src/modules/visibility/visibility.cpp
@@ -11,7 +11,7 @@ modify it under the terms of the GNU General Public License
 as published by the Free Software Foundation; either version 2

 of the License, or (at your option) any later version.

 

-This program is distributed in the hope that it will be useful,

+This program is distributed in the hope that it will be useful, 

 but WITHOUT ANY WARRANTY; without even the implied warranty of

 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the

 GNU General Public License for more details.

@@ -22,64 +22,64 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 */

 #include "..\..\core\commonheaders.h"

 

-static void SetListGroupIcons(HWND hwndList,HANDLE hFirstItem,HANDLE hParentItem,int *groupChildCount)

+static void SetListGroupIcons(HWND hwndList, HANDLE hFirstItem, HANDLE hParentItem, int *groupChildCount)

 {

 	int typeOfFirst;

-	int iconOn[2]={1,1};

-	int childCount[2]={0,0},i;

+	int iconOn[2]={1, 1};

+	int childCount[2]={0, 0}, i;

 	int iImage;

-	HANDLE hItem,hChildItem;

+	HANDLE hItem, hChildItem;

 

-	typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);

+	typeOfFirst=SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

 	//check groups

 	if (typeOfFirst == CLCIT_GROUP) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

 	while (hItem) {

-		hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);

-		if (hChildItem) SetListGroupIcons(hwndList,hChildItem,hItem,childCount);

+		hChildItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+		if (hChildItem) SetListGroupIcons(hwndList, hChildItem, hItem, childCount);

 		for ( i=0; i < SIZEOF(iconOn); i++)

-			if (iconOn[i] && SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,i) == 0) iconOn[i]=0;

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hItem);

+			if (iconOn[i] && SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i) == 0) iconOn[i]=0;

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

 	//check contacts

 	if (typeOfFirst == CLCIT_CONTACT) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while (hItem) {

 		for ( i=0; i < SIZEOF(iconOn); i++) {

-			iImage=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,i);

+			iImage=SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, i);

 			if (iconOn[i] && iImage == 0) iconOn[i]=0;

 			if (iImage != 0xFF) childCount[i]++;

 		}

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

 	//set icons

 	for ( i=0; i < SIZEOF(iconOn); i++) {

-		SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hParentItem,MAKELPARAM(i,childCount[i]?(iconOn[i]?i+1:0):0xFF));

+		SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hParentItem, MAKELPARAM(i, childCount[i]?(iconOn[i]?i+1:0):0xFF));

 		if (groupChildCount) groupChildCount[i]+=childCount[i];

 	}

 }

 

-static void SetAllChildIcons(HWND hwndList,HANDLE hFirstItem,int iColumn,int iImage)

+static void SetAllChildIcons(HWND hwndList, HANDLE hFirstItem, int iColumn, int iImage)

 {

-	int typeOfFirst,iOldIcon;

-	HANDLE hItem,hChildItem;

+	int typeOfFirst, iOldIcon;

+	HANDLE hItem, hChildItem;

 

-	typeOfFirst=SendMessage(hwndList,CLM_GETITEMTYPE,(WPARAM)hFirstItem,0);

+	typeOfFirst=SendMessage(hwndList, CLM_GETITEMTYPE, (WPARAM)hFirstItem, 0);

 	//check groups

 	if (typeOfFirst == CLCIT_GROUP) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hFirstItem);

 	while (hItem) {

-		hChildItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_CHILD,(LPARAM)hItem);

-		if (hChildItem) SetAllChildIcons(hwndList,hChildItem,iColumn,iImage);

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTGROUP,(LPARAM)hItem);

+		hChildItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_CHILD, (LPARAM)hItem);

+		if (hChildItem) SetAllChildIcons(hwndList, hChildItem, iColumn, iImage);

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTGROUP, (LPARAM)hItem);

 	}

 	//check contacts

 	if (typeOfFirst == CLCIT_CONTACT) hItem=hFirstItem;

-	else hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hFirstItem);

+	else hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hFirstItem);

 	while (hItem) {

-		iOldIcon=SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,iColumn);

-		if (iOldIcon != 0xFF && iOldIcon != iImage) SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(iColumn,iImage));

-		hItem=(HANDLE)SendMessage(hwndList,CLM_GETNEXTITEM,CLGN_NEXTCONTACT,(LPARAM)hItem);

+		iOldIcon=SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, iColumn);

+		if (iOldIcon != 0xFF && iOldIcon != iImage) SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(iColumn, iImage));

+		hItem=(HANDLE)SendMessage(hwndList, CLM_GETNEXTITEM, CLGN_NEXTCONTACT, (LPARAM)hItem);

 	}

 }

 

@@ -87,48 +87,48 @@ static void ResetListOptions(HWND hwndList)
 {

 	int i;

 

-	SendMessage(hwndList,CLM_SETBKBITMAP,0,(LPARAM)(HBITMAP)NULL);

-	SendMessage(hwndList,CLM_SETBKCOLOR,GetSysColor(COLOR_WINDOW),0);

-	SendMessage(hwndList,CLM_SETGREYOUTFLAGS,0,0);

-	SendMessage(hwndList,CLM_SETLEFTMARGIN,2,0);

-	SendMessage(hwndList,CLM_SETINDENT,10,0);

+	SendMessage(hwndList, CLM_SETBKBITMAP, 0, (LPARAM)(HBITMAP)NULL);

+	SendMessage(hwndList, CLM_SETBKCOLOR, GetSysColor(COLOR_WINDOW), 0);

+	SendMessage(hwndList, CLM_SETGREYOUTFLAGS, 0, 0);

+	SendMessage(hwndList, CLM_SETLEFTMARGIN, 2, 0);

+	SendMessage(hwndList, CLM_SETINDENT, 10, 0);

 	for (i=0;i<=FONTID_MAX;i++)

-		SendMessage(hwndList,CLM_SETTEXTCOLOR,i,GetSysColor(COLOR_WINDOWTEXT));

-	SetWindowLongPtr(hwndList,GWL_STYLE,GetWindowLongPtr(hwndList,GWL_STYLE)|CLS_SHOWHIDDEN);

+		SendMessage(hwndList, CLM_SETTEXTCOLOR, i, GetSysColor(COLOR_WINDOWTEXT));

+	SetWindowLongPtr(hwndList, GWL_STYLE, GetWindowLongPtr(hwndList, GWL_STYLE)|CLS_SHOWHIDDEN);

 }

 

 static void SetAllContactIcons(HWND hwndList)

 {

-	HANDLE hContact,hItem;

+	HANDLE hContact, hItem;

 	char *szProto;

 	DWORD flags;

 	WORD status;

 

-	hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+	hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

 	do {

-		hItem=(HANDLE)SendMessage(hwndList,CLM_FINDCONTACT,(WPARAM)hContact,0);

+		hItem=(HANDLE)SendMessage(hwndList, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 		if (hItem) {

-			szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO,(WPARAM)hContact,0);

+			szProto=(char*)CallService(MS_PROTO_GETCONTACTBASEPROTO, (WPARAM)hContact, 0);

 			if (szProto == NULL) {flags=0; status=0;}

 			else {

-				flags=CallProtoService(szProto,PS_GETCAPS,PFLAGNUM_1,0);

-				status=DBGetContactSettingWord(hContact,szProto,"ApparentMode",0);

+				flags=CallProtoService(szProto, PS_GETCAPS, PFLAGNUM_1, 0);

+				status=DBGetContactSettingWord(hContact, szProto, "ApparentMode", 0);

 			}

 			if (flags&PF1_INVISLIST) {

-				if (SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(0,0)) == 0xFF)

-					SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(0,status == ID_STATUS_ONLINE?1:0));

+				if (SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0, 0)) == 0xFF)

+					SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(0, status == ID_STATUS_ONLINE?1:0));

 			}

 			if (flags&PF1_VISLIST) {

-				if (SendMessage(hwndList,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(1,0)) == 0xFF)

-					SendMessage(hwndList,CLM_SETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(1,status == ID_STATUS_OFFLINE?2:0));

+				if (SendMessage(hwndList, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(1, 0)) == 0xFF)

+					SendMessage(hwndList, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(1, status == ID_STATUS_OFFLINE?2:0));

 			}

 		}

-	} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));

+	} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0));

 }

 

 static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LPARAM lParam)

 {

-	static HICON hVisibleIcon,hInvisibleIcon;

+	static HICON hVisibleIcon, hInvisibleIcon;

 	static HANDLE hItemAll;

 

 	switch (msg)

@@ -136,32 +136,32 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 		case WM_INITDIALOG:

 			TranslateDialogDefault(hwndDlg);

 			{	HIMAGELIST hIml;

-				hIml=ImageList_Create(GetSystemMetrics(SM_CXSMICON),GetSystemMetrics(SM_CYSMICON),(IsWinVerXPPlus()?ILC_COLOR32:ILC_COLOR16)|ILC_MASK,3,3);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_OTHER_SMALLDOT);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_STATUS_INVISIBLE);

-				ImageList_AddIcon_IconLibLoaded(hIml,SKINICON_STATUS_OFFLINE);

-				SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_SETEXTRAIMAGELIST,0,(LPARAM)hIml);

-				hVisibleIcon=ImageList_GetIcon(hIml,1,ILD_NORMAL);

-				SendDlgItemMessage(hwndDlg,IDC_VISIBLEICON,STM_SETICON,(WPARAM)hVisibleIcon,0);

-				hInvisibleIcon=ImageList_GetIcon(hIml,2,ILD_NORMAL);

-				SendDlgItemMessage(hwndDlg,IDC_INVISIBLEICON,STM_SETICON,(WPARAM)hInvisibleIcon,0);

+				hIml=ImageList_Create(GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), (IsWinVerXPPlus()?ILC_COLOR32:ILC_COLOR16)|ILC_MASK, 3, 3);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_OTHER_SMALLDOT);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_INVISIBLE);

+				ImageList_AddIcon_IconLibLoaded(hIml, SKINICON_STATUS_OFFLINE);

+				SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGELIST, 0, (LPARAM)hIml);

+				hVisibleIcon=ImageList_GetIcon(hIml, 1, ILD_NORMAL);

+				SendDlgItemMessage(hwndDlg, IDC_VISIBLEICON, STM_SETICON, (WPARAM)hVisibleIcon, 0);

+				hInvisibleIcon=ImageList_GetIcon(hIml, 2, ILD_NORMAL);

+				SendDlgItemMessage(hwndDlg, IDC_INVISIBLEICON, STM_SETICON, (WPARAM)hInvisibleIcon, 0);

 			}

 

-			ResetListOptions(GetDlgItem(hwndDlg,IDC_LIST));

-			SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_SETEXTRACOLUMNS,2,0);

+			ResetListOptions(GetDlgItem(hwndDlg, IDC_LIST));

+			SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRACOLUMNS, 2, 0);

 

 			{	CLCINFOITEM cii={0};

 				cii.cbSize=sizeof(cii);

 				cii.flags=CLCIIF_GROUPFONT;

 				cii.pszText=TranslateT("** All contacts **");

-				hItemAll=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_ADDINFOITEM,0,(LPARAM)&cii);

+				hItemAll=(HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_ADDINFOITEM, 0, (LPARAM)&cii);

 			}

 

-			SetAllContactIcons(GetDlgItem(hwndDlg,IDC_LIST));

-			SetListGroupIcons(GetDlgItem(hwndDlg,IDC_LIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hItemAll,NULL);

+			SetAllContactIcons(GetDlgItem(hwndDlg, IDC_LIST));

+			SetListGroupIcons(GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

 			return TRUE;

 		case WM_SETFOCUS:

-			SetFocus(GetDlgItem(hwndDlg,IDC_LIST));

+			SetFocus(GetDlgItem(hwndDlg, IDC_LIST));

 			break;

 		case WM_NOTIFY:

 			switch(((LPNMHDR)lParam)->idFrom) {

@@ -170,13 +170,13 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 					{

 						case CLN_NEWCONTACT:

 						case CLN_LISTREBUILT:

-							SetAllContactIcons(GetDlgItem(hwndDlg,IDC_LIST));

+							SetAllContactIcons(GetDlgItem(hwndDlg, IDC_LIST));

 							//fall through

 						case CLN_CONTACTMOVED:

-							SetListGroupIcons(GetDlgItem(hwndDlg,IDC_LIST),(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETNEXTITEM,CLGN_ROOT,0),hItemAll,NULL);

+							SetListGroupIcons(GetDlgItem(hwndDlg, IDC_LIST), (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETNEXTITEM, CLGN_ROOT, 0), hItemAll, NULL);

 							break;

 						case CLN_OPTIONSCHANGED:

-							ResetListOptions(GetDlgItem(hwndDlg,IDC_LIST));

+							ResetListOptions(GetDlgItem(hwndDlg, IDC_LIST));

 							break;

 						case NM_CLICK:

 						{	HANDLE hItem;

@@ -190,7 +190,7 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 								break;

 

 							// Find clicked item

-							hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x,nm->pt.y));

+							hItem = (HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_HITTEST, (WPARAM)&hitFlags, MAKELPARAM(nm->pt.x, nm->pt.y));

 							// Nothing was clicked

 							if (hItem == NULL) break; 

 							// It was not a visbility icon

@@ -210,7 +210,7 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 							// Update list, making sure that the options are mutually exclusive

 							if (itemType == CLCIT_CONTACT) { // A contact

 								SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn, iImage));

-								if (iImage && SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(nm->iColumn?0:1,0)) != 0xFF)

+								if (iImage && SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn?0:1, 0)) != 0xFF)

 									SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_SETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(nm->iColumn?0:1, 0));

 							}

 							else if (itemType == CLCIT_INFO) {	 // All Contacts

@@ -239,25 +239,25 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 					switch (((LPNMHDR)lParam)->code)

 					{

 						case PSN_APPLY:

-						{	HANDLE hContact,hItem;

-							int set,i,iImage;

+						{	HANDLE hContact, hItem;

+							int set, i, iImage;

 

-							hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST,0,0);

+							hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDFIRST, 0, 0);

 							do {

-								hItem=(HANDLE)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_FINDCONTACT,(WPARAM)hContact,0);

+								hItem=(HANDLE)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_FINDCONTACT, (WPARAM)hContact, 0);

 								if (hItem) {

 									set=0;

 									for (i=0;i<2;i++) {

-										iImage=SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETEXTRAIMAGE,(WPARAM)hItem,MAKELPARAM(i,0));

+										iImage=SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGE, (WPARAM)hItem, MAKELPARAM(i, 0));

 										if (iImage == i+1) {

-											CallContactService(hContact,PSS_SETAPPARENTMODE,iImage == 1?ID_STATUS_ONLINE:ID_STATUS_OFFLINE,0);

+											CallContactService(hContact, PSS_SETAPPARENTMODE, iImage == 1?ID_STATUS_ONLINE:ID_STATUS_OFFLINE, 0);

 											set=1;

 											break;

 										}

 									}

-									if (!set) CallContactService(hContact,PSS_SETAPPARENTMODE,0,0);

+									if (!set) CallContactService(hContact, PSS_SETAPPARENTMODE, 0, 0);

 								}

-							} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT,(WPARAM)hContact,0));

+							} while (hContact=(HANDLE)CallService(MS_DB_CONTACT_FINDNEXT, (WPARAM)hContact, 0));

 							return TRUE;

 						}

 					}

@@ -267,7 +267,7 @@ static INT_PTR CALLBACK DlgProcVisibilityOpts(HWND hwndDlg, UINT msg, WPARAM, LP
 		case WM_DESTROY:

 			DestroyIcon(hVisibleIcon);

 			DestroyIcon(hInvisibleIcon);

-			{	HIMAGELIST hIml=(HIMAGELIST)SendDlgItemMessage(hwndDlg,IDC_LIST,CLM_GETEXTRAIMAGELIST,0,0);

+			{	HIMAGELIST hIml=(HIMAGELIST)SendDlgItemMessage(hwndDlg, IDC_LIST, CLM_GETEXTRAIMAGELIST, 0, 0);

 				ImageList_Destroy(hIml);

 			}

 			break;

@@ -292,6 +292,6 @@ static int VisibilityOptInitialise(WPARAM wParam, LPARAM)
 

 int LoadVisibilityModule(void)

 {

-	HookEvent(ME_OPT_INITIALISE,VisibilityOptInitialise);

+	HookEvent(ME_OPT_INITIALISE, VisibilityOptInitialise);

 	return 0;

 }