final switch to the typed icolib api

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

11 files changed, 78 insertions, 80 deletions

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index d29a6272e9..dd1a660c5c 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -1095,13 +1095,13 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
 			SetWindowLongPtr(Frames[pos].TitleBar.hwnd, GWL_STYLE, (LONG)style & ~(WS_VSCROLL | WS_HSCROLL));

 

 			ulockfrm();

-			CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+			CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

 			SetWindowPos(Frames[pos].TitleBar.hwnd, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);

 			return 0;

 		}

 

 		case FO_NAME:

-			if (lParam == (LPARAM)NULL) {

+			if (lParam == 0) {

 				ulockfrm();

 				return -1;

 			}

@@ -1111,7 +1111,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
 			return 0;

 

 		case FO_TBNAME:

-			if (lParam == (LPARAM)NULL) {

+			if (lParam == 0) {

 				ulockfrm();

 				return(-1);

 			}

@@ -1123,7 +1123,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
 			return 0;

 

 		case FO_TBTIPNAME:

-			if (lParam == (LPARAM)NULL) {

+			if (lParam == 0) {

 				ulockfrm();

 				return(-1);

 			}

@@ -1167,7 +1167,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
 				retval = Frames[pos].height;

 

 				if (Frames[pos].height != oldHeight) {

-					CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,(LPARAM)0);

+					CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList,0);

 					if (Frames[pos].Skinned)

 						RedrawWindow(Frames[pos].hWnd, 0, 0, RDW_FRAME|RDW_UPDATENOW|RDW_INVALIDATE);

 				}

@@ -1211,7 +1211,7 @@ INT_PTR CLUIFramesSetFrameOptions(WPARAM wParam, LPARAM lParam)
 			return(0);

 	}

 	ulockfrm();

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

 	return -1;

 }

 

@@ -1223,7 +1223,7 @@ static INT_PTR CLUIFramesShowAll(WPARAM wParam, LPARAM lParam)
 

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

 		Frames[i].visible = TRUE;

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

 	return 0;

 }

 

@@ -1237,7 +1237,7 @@ INT_PTR CLUIFramesShowAllTitleBars(WPARAM wParam, LPARAM lParam)
 		Frames[i].TitleBar.ShowTitleBar = TRUE;

 		SetWindowPos(Frames[i].hWnd, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);

 	}

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

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

 	return 0;

 }

@@ -1253,7 +1253,7 @@ INT_PTR CLUIFramesHideAllTitleBars(WPARAM wParam, LPARAM lParam)
 		Frames[i].TitleBar.ShowTitleBar = FALSE;

 		SetWindowPos(Frames[i].hWnd, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);

 	}

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

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

 	return 0;

 }

@@ -1278,7 +1278,7 @@ INT_PTR CLUIFramesShowHideFrame(WPARAM wParam, LPARAM lParam)
 	}

 	ulockfrm();

 	if (!Frames[pos].floating)

-		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

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

 	return 0;

 }

@@ -1298,7 +1298,7 @@ INT_PTR CLUIFramesShowHideFrameTitleBar(WPARAM wParam, LPARAM lParam)
 		SetWindowPos(Frames[pos].hWnd, 0, 0, 0, 0, 0, SWP_NOZORDER | SWP_NOMOVE | SWP_NOSIZE | SWP_FRAMECHANGED);

 	}

 	ulockfrm();

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

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

 	return 0;

 }

@@ -1704,7 +1704,7 @@ static int UpdateTBToolTip(int framepos)
 		ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS ;

 		ti.uId = (UINT_PTR)Frames[framepos].TitleBar.hwnd;

 

-		return(SendMessage(Frames[framepos].TitleBar.hwndTip, TTM_UPDATETIPTEXT, (WPARAM)0, (LPARAM)&ti));

+		return(SendMessage(Frames[framepos].TitleBar.hwndTip, TTM_UPDATETIPTEXT, 0, (LPARAM)&ti));

 	}

 

 };

@@ -1971,7 +1971,7 @@ INT_PTR CLUIFramesAddFrame(WPARAM wParam, LPARAM lParam)
 		ti.hinst = g_hInst;

 		ti.uFlags = TTF_IDISHWND | TTF_SUBCLASS ;

 		ti.uId = (UINT_PTR)Frames[nFramescount].TitleBar.hwnd;

-		res = SendMessageA(Frames[nFramescount].TitleBar.hwndTip, TTM_ADDTOOL, (WPARAM)0, (LPARAM) & ti);

+		res = SendMessageA(Frames[nFramescount].TitleBar.hwndTip, TTM_ADDTOOL, 0, (LPARAM) & ti);

 	}

 

 	SendMessage(Frames[nFramescount].TitleBar.hwndTip, TTM_ACTIVATE, (WPARAM)Frames[nFramescount].TitleBar.ShowTitleBarTip, 0);

@@ -2312,7 +2312,7 @@ INT_PTR CLUIFramesUpdateFrame(WPARAM wParam, LPARAM lParam)
 	if (FramesSysNotStarted)

 		return -1;

 	if (wParam == -1) {

-		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+		CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

 		return 0;

 	}

 	if (lParam&FU_FMPOS)

@@ -2701,7 +2701,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 						CLUIFrameSetFloat(Frameid, 0);

 						break;

 				}

-				CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+				CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

 			}

 

 			break;

@@ -2831,7 +2831,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 							  Frames[pos].order

 							 );

 

-					oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM(FO_FLAGS, Frames[pos].id), (LPARAM)0);

+					oldflags = CallService(MS_CLIST_FRAMES_GETFRAMEOPTIONS, MAKEWPARAM(FO_FLAGS, Frames[pos].id), 0);

 					if (!(oldflags&F_SHOWTBTIP))

 						oldflags |= F_SHOWTBTIP;

 				}

@@ -3030,7 +3030,7 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				}

 				ulockfrm();

 				if (newh > 0) {

-					CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+					CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

 				}

 				break;

 			}

@@ -3177,7 +3177,7 @@ LRESULT CALLBACK CLUIFrameContainerWndProc(HWND hwnd, UINT msg, WPARAM wParam, L
 			}

 

 			memset(&minmax, 0, sizeof(minmax));

-			if (SendMessage(Frames[framepos].hWnd, WM_GETMINMAXINFO, (WPARAM)0, (LPARAM)&minmax) == 0) {

+			if (SendMessage(Frames[framepos].hWnd, WM_GETMINMAXINFO, 0, (LPARAM)&minmax) == 0) {

 				RECT border;

 				int tbh = TitleBarH * btoint(Frames[framepos].TitleBar.ShowTitleBar);

 				GetBorderSize(hwnd, &border);

@@ -3342,7 +3342,7 @@ INT_PTR CLUIFrameSetFloat(WPARAM wParam, LPARAM lParam)
 

 	hwndtmp = Frames[wParam].ContainerWnd;

 	ulockfrm();

-	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, (LPARAM)0);

+	CLUIFramesOnClistResize((WPARAM)pcli->hwndContactList, 0);

 	SendMessage(hwndtmp, WM_SIZE, 0, 0);

 	SetWindowPos(hwndtooltiptmp, HWND_TOPMOST, 0, 0, 0, 0, SWP_NOMOVE | SWP_NOSIZE);

 	return 0;

diff --git a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
index 07b6ebc4e6..ac722ca5a6 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
@@ -216,7 +216,7 @@ int InitFramesMenus(void)
 			op.Handle=hFrameMenuObject;

 			op.Setting=OPT_MENUOBJECT_SET_FREE_SERVICE;

 			op.Value=(INT_PTR)"FrameMenuFreeService";

-			CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+			CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 		}

 	}

 	return 0;

diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index 99d93d30fd..7c5251f823 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -113,7 +113,7 @@ static INT_PTR AddGroupMenuItem(WPARAM wParam,LPARAM lParam)
 	op.Handle=(HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hGroupMenuObject,(LPARAM)&tmi);

 	op.Setting=OPT_MENUITEMSETUNIQNAME;

 	op.Value=(INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUITEM,0,(LPARAM)&op);

 	return (INT_PTR)op.Handle;

 }

 

@@ -311,23 +311,23 @@ void InitGroupMenus(void)
 	tmp.CheckService=NULL;

 	tmp.ExecService="CLISTMENUSGroup/ExecService";

 	tmp.name="GroupMenu";

-	hGroupMenuObject=(HANDLE)CallService(MO_CREATENEWMENUOBJECT,(WPARAM)0,(LPARAM)&tmp);

+	hGroupMenuObject=(HANDLE)CallService(MO_CREATENEWMENUOBJECT,0,(LPARAM)&tmp);

 

 

 	op.Handle=hGroupMenuObject;

 	op.Setting=OPT_USERDEFINEDITEMS;

 	op.Value=TRUE;

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	op.Handle=hGroupMenuObject;

 	op.Setting=OPT_MENUOBJECT_SET_FREE_SERVICE;

 	op.Value=(INT_PTR)"CLISTMENUSGroup/FreeOwnerDataGroupMenu";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	op.Handle=hGroupMenuObject;

 	op.Setting=OPT_MENUOBJECT_SET_ONADD_SERVICE;

 	op.Value=(INT_PTR)"CLISTMENUSGroup/GroupMenuonAddService";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	{

 		//add  exit command to menu

@@ -339,14 +339,14 @@ void InitGroupMenus(void)
 		mi.position=1900000;

 		mi.pszService="CloseAction";

 		mi.pszName=LPGEN("E&xit");

-		AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		AddGroupMenuItem(0,(LPARAM)&mi);

 

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize=sizeof(mi);

 		mi.position=500;

 		mi.pszService=MS_CLIST_SHOWHIDE;

 		mi.pszName=LPGEN("&Hide/Show");

-		hHideShowMainMenuItem=(HANDLE)AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		hHideShowMainMenuItem=(HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize=sizeof(mi);

@@ -355,28 +355,28 @@ void InitGroupMenus(void)
 		mi.icolibItem=LoadSkinnedIconHandle(SKINICON_OTHER_FINDUSER); //LoadIcon(GetModuleHandle(NULL), MAKEINTRESOURCE(IDI_FINDUSER));

 		mi.pszService="FindAdd/FindAddCommand";

 		mi.pszName=LPGEN("&Find/Add Contacts...");

-		AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		AddGroupMenuItem(0,(LPARAM)&mi);

 

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize=sizeof(mi);

 		mi.position=300000;

 		mi.pszService="";

 		mi.pszName=LPGEN("&Main Menu");

-		hGroupMainMenuItemProxy=(HANDLE)AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		hGroupMainMenuItemProxy=(HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize=sizeof(mi);

 		mi.position=300100;

 		mi.pszService="";

 		mi.pszName=LPGEN("&Status");

-		hGroupStatusMenuItemProxy=(HANDLE)AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		hGroupStatusMenuItemProxy=(HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize=sizeof(mi);

 		mi.position=390100;

 		mi.pszService="";

 		mi.pszName=LPGEN("Appearance");

-		hAppearanceMenuItemProxy=(HANDLE)AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		hAppearanceMenuItemProxy=(HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize=sizeof(mi);

@@ -386,7 +386,7 @@ void InitGroupMenus(void)
 		mi.pszService="Options/OptionsCommand";

 		mi.pszName=LPGEN("&Options...");

 

-		AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		AddGroupMenuItem(0,(LPARAM)&mi);

 

 

 		memset(&mi,0,sizeof(mi));

@@ -397,7 +397,7 @@ void InitGroupMenus(void)
 		mi.pszService="CLN/About";

 		mi.pszName=LPGEN("&About the contact list...");

 

-		AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		AddGroupMenuItem(0,(LPARAM)&mi);

 

 		memset(&mi,0,sizeof(mi));

 		mi.cbSize=sizeof(mi);

@@ -425,7 +425,7 @@ void InitGroupMenus(void)
 		mi.hIcon=NULL;

 		mi.pszService="CLISTMENUSGroup/HideOfflineRootHelper";

 		mi.pszName=LPGEN("Hide &Offline Users out here");

-		hHideOfflineUsersOutHereMenuItem=(HANDLE)AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		hHideOfflineUsersOutHereMenuItem=(HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

 

 		memset(&mi,0,sizeof(mi));

@@ -434,7 +434,7 @@ void InitGroupMenus(void)
 		mi.hIcon=NULL;

 		mi.pszService="CLISTMENUSGroup/HideGroupsHelper";

 		mi.pszName=LPGEN("Hide &Empty Groups");

-		hHideEmptyGroupsMenuItem=(HANDLE)AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		hHideEmptyGroupsMenuItem=(HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

 

 

@@ -444,7 +444,7 @@ void InitGroupMenus(void)
 		mi.hIcon=NULL;

 		mi.pszService="CLISTMENUSGroup/UseGroupsHelper";

 		mi.pszName=LPGEN("Disable &Groups");

-		hDisableGroupsMenuItem=(HANDLE)AddGroupMenuItem((WPARAM)0,(LPARAM)&mi);

+		hDisableGroupsMenuItem=(HANDLE)AddGroupMenuItem(0,(LPARAM)&mi);

 

 

 		//MS_CLIST_GROUPCREATE

@@ -534,7 +534,7 @@ static INT_PTR AddSubGroupMenuItem(WPARAM wParam,LPARAM lParam)
 	op.Handle=(HANDLE)CallService(MO_ADDNEWMENUITEM,(WPARAM)hSubGroupMenuObject,(LPARAM)&tmi);

 	op.Setting=OPT_MENUITEMSETUNIQNAME;

 	op.Value=(INT_PTR)buf;

-	CallService(MO_SETOPTIONSMENUITEM,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUITEM,0,(LPARAM)&op);

 	return (INT_PTR)op.Handle;

 }

 

@@ -638,23 +638,23 @@ void InitSubGroupMenus(void)
 	tmp.CheckService=NULL;

 	tmp.ExecService="CLISTMENUSSubGroup/ExecService";

 	tmp.name="SubGroupMenu";

-	hSubGroupMenuObject=(HANDLE)CallService(MO_CREATENEWMENUOBJECT,(WPARAM)0,(LPARAM)&tmp);

+	hSubGroupMenuObject=(HANDLE)CallService(MO_CREATENEWMENUOBJECT,0,(LPARAM)&tmp);

 

 

 	op.Handle=hSubGroupMenuObject;

 	op.Setting=OPT_USERDEFINEDITEMS;

 	op.Value=TRUE;

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	op.Handle=hSubGroupMenuObject;

 	op.Setting=OPT_MENUOBJECT_SET_FREE_SERVICE;

 	op.Value=(INT_PTR)"CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	op.Handle=hSubGroupMenuObject;

 	op.Setting=OPT_MENUOBJECT_SET_ONADD_SERVICE;

 	op.Value=(INT_PTR)"CLISTMENUSSubGroup/SubGroupMenuonAddService";

-	CallService(MO_SETOPTIONSMENUOBJECT,(WPARAM)0,(LPARAM)&op);

+	CallService(MO_SETOPTIONSMENUOBJECT,0,(LPARAM)&op);

 

 	{

 		//add  exit command to menu

diff --git a/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp b/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp
index 499c98ca1a..becee0c91c 100644
--- a/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp
+++ b/plugins/Clist_nicer/src/Coolsb/coolscroll.cpp
@@ -2515,7 +2515,7 @@ static LRESULT MouseMove(SCROLLWND *sw, HWND hwnd, WPARAM wParam, LPARAM lParam)
 					

 					//remember what size the USER set the button to

 					sbut->nSizeReserved = sbut->nSize;

-					NCPaint(sw, hwnd, (WPARAM)1, (LPARAM)0);

+					NCPaint(sw, hwnd, (WPARAM)1, 0);

 					return 0;

 				}

 			}

diff --git a/plugins/Clist_nicer/src/clc.cpp b/plugins/Clist_nicer/src/clc.cpp
index 5c70df5d48..190ffffba7 100644
--- a/plugins/Clist_nicer/src/clc.cpp
+++ b/plugins/Clist_nicer/src/clc.cpp
@@ -691,7 +691,7 @@ LBL_Def:
 

 						if (column == 0) {

 							ci.dwFlag	= CNF_EMAIL;

-							if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)) {

+							if (!CallService(MS_CONTACT_GETCONTACTINFO,0,(LPARAM)&ci)) {

 								char buf[4096];

 								mir_snprintf(buf, sizeof(buf), "mailto:%s", (LPCSTR)ci.pszVal);

 								mir_free(ci.pszVal);

@@ -701,7 +701,7 @@ LBL_Def:
 						}

 						if (column == 1) {

 							ci.dwFlag	= CNF_HOMEPAGE;

-							if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)) {

+							if (!CallService(MS_CONTACT_GETCONTACTINFO,0,(LPARAM)&ci)) {

 								ShellExecuteA(hwnd, "open", (LPCSTR)ci.pszVal, NULL, NULL, SW_SHOW);

 								mir_free(ci.pszVal);

 							}

diff --git a/plugins/Clist_nicer/src/clcitems.cpp b/plugins/Clist_nicer/src/clcitems.cpp
index 8086fe7ebd..ebf7229ab9 100644
--- a/plugins/Clist_nicer/src/clcitems.cpp
+++ b/plugins/Clist_nicer/src/clcitems.cpp
@@ -490,25 +490,25 @@ void GetExtendedInfo(struct ClcContact *contact, struct ClcData *dat)
 	ci.szProto	= contact->proto;

 

 	ci.dwFlag	= CNF_EMAIL;

-	if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)) {

+	if (!CallService(MS_CONTACT_GETCONTACTINFO,0,(LPARAM)&ci)) {

 		cfg::eCache[index].iExtraImage[EXTRA_ICON_EMAIL] = 0;

 		mir_free(ci.pszVal);

 	}

 

 	ci.dwFlag	= CNF_HOMEPAGE;

-	if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)) {

+	if (!CallService(MS_CONTACT_GETCONTACTINFO,0,(LPARAM)&ci)) {

 		cfg::eCache[index].iExtraImage[EXTRA_ICON_WEB] = 1;

 		mir_free(ci.pszVal);

 	}

 

 	ci.dwFlag	= CNF_CELLULAR;

-	if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)) {

+	if (!CallService(MS_CONTACT_GETCONTACTINFO,0,(LPARAM)&ci)) {

 		cfg::eCache[index].iExtraImage[EXTRA_ICON_SMS] = 2;

 		mir_free(ci.pszVal);

 	}

 	else {

 		ci.dwFlag	= CNF_PHONE;

-		if (!CallService(MS_CONTACT_GETCONTACTINFO,(WPARAM)0,(LPARAM)&ci)) {

+		if (!CallService(MS_CONTACT_GETCONTACTINFO,0,(LPARAM)&ci)) {

 			cfg::eCache[index].iExtraImage[EXTRA_ICON_SMS] = 2;

 			mir_free(ci.pszVal);

 		}

diff --git a/plugins/Clist_nicer/src/clistmenus.cpp b/plugins/Clist_nicer/src/clistmenus.cpp
index cc2f9c1bac..b4abce1084 100644
--- a/plugins/Clist_nicer/src/clistmenus.cpp
+++ b/plugins/Clist_nicer/src/clistmenus.cpp
@@ -48,7 +48,7 @@ INT_PTR CloseAction(WPARAM wParam,LPARAM lParam)
 {

 	int k;

 	cfg::shutDown = 1;

-	k=CallService(MS_SYSTEM_OKTOEXIT,(WPARAM)0,(LPARAM)0);

+	k=CallService(MS_SYSTEM_OKTOEXIT,0,0);

 	if (k) {

 		DestroyWindow(pcli->hwndContactList);

 		PostQuitMessage(0);

@@ -218,7 +218,7 @@ static INT_PTR CALLBACK IgnoreDialogProc(HWND hWnd, UINT msg, WPARAM wParam, LPA
 			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, (LPARAM)0xffffffff);

 			return 0;

 		case IDC_IGN_NONE:

-			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, (LPARAM)0);

+			SendMessage(hWnd, WM_USER + 100, (WPARAM)hContact, 0);

 		  	return 0;

 		case IDC_IGN_ALWAYSONLINE:

 			if (IsDlgButtonChecked(hWnd, IDC_IGN_ALWAYSONLINE))

diff --git a/plugins/Clist_nicer/src/clistmod.cpp b/plugins/Clist_nicer/src/clistmod.cpp
index d07f079815..305d4aece1 100644
--- a/plugins/Clist_nicer/src/clistmod.cpp
+++ b/plugins/Clist_nicer/src/clistmod.cpp
@@ -75,7 +75,7 @@ int IconFromStatusMode(const char *szProto, int status, HANDLE hContact, HICON *
 		if (szProto) {

 			char szBuf[128];

 			mir_snprintf(szBuf, 128, "%s_conn", szProto);

-			*phIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szBuf);

+			*phIcon = Skin_GetIcon(szBuf);

 		}

 	}

 	return saveIconFromStatusMode(szFinalProto, finalStatus, hContact);

@@ -263,7 +263,7 @@ int ShowHide(WPARAM wParam, LPARAM lParam)
 		GetWindowRect(pcli->hwndContactList, &rcWindow);

 		if (Utils_AssertInsideScreen(&rcWindow) == 1)

 		{

-			MoveWindow(pcli->hwndContactList, rcWindow.left, rcWindow.top, 

+			MoveWindow(pcli->hwndContactList, rcWindow.left, rcWindow.top,

 				rcWindow.right - rcWindow.left, rcWindow.bottom - rcWindow.top, TRUE);

 		}

 	}

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index fb03c74075..1a238e5f9d 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -217,7 +217,7 @@ static int CreateCLC(HWND parent)
 		frame.align = alBottom;

 		frame.hWnd = CreateWindowExA(0, "EventAreaClass", "evt", WS_VISIBLE | WS_CHILD | WS_TABSTOP, 0, 0, 20, 20, pcli->hwndContactList, (HMENU) 0, g_hInst, NULL);

 		g_hwndEventArea = frame.hWnd;

-		hNotifyFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM) & frame, (LPARAM)0);

+		hNotifyFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME, (WPARAM) & frame, 0);

 		CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hNotifyFrame, FU_FMPOS);

 		HideShowNotifyFrame();

 		CreateViewModeFrame();

@@ -236,7 +236,7 @@ static int CreateCLC(HWND parent)
 		Frame.tname = _T("My Contacts");

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

 		Frame.height = 200;

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

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

 		//free(Frame.name);

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

 

@@ -292,17 +292,17 @@ static void CacheClientIcons()
 

 	for (i = IDI_OVL_OFFLINE; i <= IDI_OVL_OUTTOLUNCH; i++) {

 		mir_snprintf(szBuffer, sizeof(szBuffer), "cln_ovl_%d", ID_STATUS_OFFLINE + (i - IDI_OVL_OFFLINE));

-		overlayicons[i - IDI_OVL_OFFLINE] = (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM) szBuffer);

+		overlayicons[i - IDI_OVL_OFFLINE] = Skin_GetIcon(szBuffer);

 	}

-	ImageList_AddIcon(himlExtraImages, (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM) "core_main_14"));

+	ImageList_AddIcon(himlExtraImages, Skin_GetIcon("core_main_14"));

 	ImageList_AddIcon(himlExtraImages, (HICON)LoadSkinnedIcon(SKINICON_EVENT_URL));

-	ImageList_AddIcon(himlExtraImages, (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM) "core_main_17"));

+	ImageList_AddIcon(himlExtraImages, Skin_GetIcon("core_main_17"));

 	if (hIconSaved != 0) {

 		ImageList_AddIcon(himlExtraImages, hIconSaved);

 		DestroyIcon(hIconSaved);

 		hIconSaved = 0;

 	} else

-		ImageList_AddIcon(himlExtraImages, (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM) "core_main_17"));

+		ImageList_AddIcon(himlExtraImages, Skin_GetIcon("core_main_17"));

 }

 

 static void InitIcoLib()

@@ -324,7 +324,7 @@ static void InitIcoLib()
 		sid.iDefaultIndex = myIcons[i].uId;

 		Skin_AddIcon(&sid);

 	}

-	

+

 	sid.pszName = "CLN_visible";

 	sid.pszDescription = LPGEN("Contact on visible list");

 	sid.iDefaultIndex = -IDI_CLVISIBLE;

@@ -397,9 +397,9 @@ void CLN_LoadAllIcons(BOOL mode)
 	if (mode) {

 		InitIcoLib();

 		hIcoLibChanged = HookEvent(ME_SKIN2_ICONSCHANGED, IcoLibChanged);

-		cfg::dat.hIconVisible = (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM) "CLN_visible");

-		cfg::dat.hIconInvisible = (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM) "CLN_invisible");

-		cfg::dat.hIconChatactive = (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM) "CLN_chatactive");

+		cfg::dat.hIconVisible = Skin_GetIcon("CLN_visible");

+		cfg::dat.hIconInvisible = Skin_GetIcon("CLN_invisible");

+		cfg::dat.hIconChatactive = Skin_GetIcon("CLN_chatactive");

 	}

 	CacheClientIcons();

 }

@@ -433,9 +433,9 @@ void ConfigureFrame()
 void IcoLibReloadIcons()

 {

 

-	cfg::dat.hIconVisible = (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM) "CLN_visible");

-	cfg::dat.hIconInvisible = (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM) "CLN_invisible");

-	cfg::dat.hIconChatactive = (HICON) CallService(MS_SKIN2_GETICON, 0, (LPARAM) "CLN_chatactive");

+	cfg::dat.hIconVisible = Skin_GetIcon("CLN_visible");

+	cfg::dat.hIconInvisible = Skin_GetIcon("CLN_invisible");

+	cfg::dat.hIconChatactive = Skin_GetIcon("CLN_chatactive");

 	CacheClientIcons();

 	ReloadExtraIcons();

 

@@ -925,7 +925,7 @@ LRESULT CALLBACK ContactListWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM l
 			//NotifyEventHooks(pcli->hPreBuildStatusMenuEvent, 0, 0);

 			SendMessage(hwnd, WM_SETREDRAW, FALSE, FALSE);

 			{

-				LONG style; 

+				LONG style;

 				BYTE windowStyle = cfg::getByte("CLUI", "WindowStyle", SETTING_WINDOWSTYLE_TOOLWINDOW);

 				ShowWindow(pcli->hwndContactList, SW_HIDE);

 				style = GetWindowLongPtr(pcli->hwndContactList, GWL_EXSTYLE);

@@ -1808,7 +1808,7 @@ buttons_done:
 					if (status >= ID_STATUS_CONNECTING && status < ID_STATUS_OFFLINE) {

 						char szBuffer[128];

 						mir_snprintf(szBuffer, 128, "%s_conn", pd->RealName);

-						hIcon = (HICON)CallService(MS_SKIN2_GETICON, 0, (LPARAM)szBuffer);

+						hIcon = Skin_GetIcon(szBuffer);

 					} else if (cfg::dat.bShowXStatusOnSbar && status > ID_STATUS_OFFLINE) {

 						ICQ_CUSTOM_STATUS cst = {0};

 						char szServiceName[128];

@@ -1832,14 +1832,14 @@ buttons_done:
 					else if (pd->statusbarpos == nParts - 1)

 						x -= (cfg::dat.bCRight / 2);

 					DrawIconEx(dis->hDC, x, (dis->rcItem.top + dis->rcItem.bottom - 16) >> 1, hIcon, 16, 16, 0, NULL, DI_NORMAL);

-					CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);

+					Skin_ReleaseIcon(hIcon);

 

 					if (cfg::getByte("CLUI", "sbar_showlocked", 1)) {

 						if (cfg::getByte(szProto, "LockMainStatus", 0)) {

 							hIcon = LoadSkinnedIcon(SKINICON_OTHER_STATUS_LOCKED);

 							if (hIcon != NULL) {

 								DrawIconEx(dis->hDC, x, (dis->rcItem.top + dis->rcItem.bottom - 16) >> 1, hIcon, 16, 16, 0, NULL, DI_NORMAL);

-								CallService(MS_SKIN2_RELEASEICON, (WPARAM)hIcon, 0);

+								Skin_ReleaseIcon(hIcon);

 							}

 						}

 					}

@@ -1928,7 +1928,7 @@ buttons_done:
 			 */

 			if (!cfg::shutDown)

 				cfg::shutDown = 1;

-			CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)hFrameContactTree, (LPARAM)0);

+			CallService(MS_CLIST_FRAMES_REMOVEFRAME, (WPARAM)hFrameContactTree, 0);

 			break;

 	}

 	return saveContactListWndProc(hwnd, msg, wParam, lParam);

diff --git a/plugins/Clist_nicer/src/cluiservices.cpp b/plugins/Clist_nicer/src/cluiservices.cpp
index 9572935020..093f950bbb 100644
--- a/plugins/Clist_nicer/src/cluiservices.cpp
+++ b/plugins/Clist_nicer/src/cluiservices.cpp
@@ -51,10 +51,10 @@ void FreeProtocolData( void )
 	for (nPanel=0;nPanel<nParts;nPanel++)

 	{

 		ProtocolData *PD;

-		PD=(ProtocolData *)SendMessage(pcli->hwndStatus,SB_GETTEXT,(WPARAM)nPanel,(LPARAM)0);

+		PD=(ProtocolData *)SendMessage(pcli->hwndStatus,SB_GETTEXT,(WPARAM)nPanel,0);

 		if (PD!=NULL&&!IsBadCodePtr((FARPROC)PD))

 		{

-			SendMessage(pcli->hwndStatus,SB_SETTEXT,(WPARAM)nPanel|SBT_OWNERDRAW,(LPARAM)0);

+			SendMessage(pcli->hwndStatus,SB_SETTEXT,(WPARAM)nPanel|SBT_OWNERDRAW,0);

 			if (PD->RealName) mir_free(PD->RealName);

 			if (PD) mir_free(PD);

 }	}	}

diff --git a/plugins/Clist_nicer/src/viewmodes.cpp b/plugins/Clist_nicer/src/viewmodes.cpp
index 17ee84f07a..2370350508 100644
--- a/plugins/Clist_nicer/src/viewmodes.cpp
+++ b/plugins/Clist_nicer/src/viewmodes.cpp
@@ -621,10 +621,10 @@ INT_PTR CALLBACK DlgProcViewModesSetup(HWND hwndDlg, UINT msg, WPARAM wParam, LP
             tci.mask = TCIF_PARAM|TCIF_TEXT;

             tci.lParam = 0;

             tci.pszText = Translate("Sticky contacts");

-            SendMessageA(GetDlgItem(hwndDlg, IDC_TAB), TCM_INSERTITEMA, (WPARAM)0, (LPARAM)&tci);

+            SendMessageA(GetDlgItem(hwndDlg, IDC_TAB), TCM_INSERTITEMA, 0, (LPARAM)&tci);

 

             tci.pszText = Translate("Filtering");

-            SendMessageA(GetDlgItem(hwndDlg, IDC_TAB), TCM_INSERTITEMA, (WPARAM)0, (LPARAM)&tci);

+            SendMessageA(GetDlgItem(hwndDlg, IDC_TAB), TCM_INSERTITEMA, 0, (LPARAM)&tci);

 

             TabCtrl_SetCurSel(GetDlgItem(hwndDlg, IDC_TAB), 0);

 

@@ -940,9 +940,9 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 			break;

 		}

 	case WM_USER + 100:

-		SendMessage(GetDlgItem(hwnd, IDC_RESETMODES), BM_SETIMAGE, IMAGE_ICON, (LPARAM)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"CLN_CLVM_reset"));

-		SendMessage(GetDlgItem(hwnd, IDC_CONFIGUREMODES), BM_SETIMAGE, IMAGE_ICON, (LPARAM)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"CLN_CLVM_options"));

-		SendMessage(GetDlgItem(hwnd, IDC_SELECTMODE), BM_SETIMAGE, IMAGE_ICON, (LPARAM)CallService(MS_SKIN2_GETICON, 0, (LPARAM)"CLN_CLVM_select"));

+		SendMessage(GetDlgItem(hwnd, IDC_RESETMODES), BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon("CLN_CLVM_reset"));

+		SendMessage(GetDlgItem(hwnd, IDC_CONFIGUREMODES), BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon("CLN_CLVM_options"));

+		SendMessage(GetDlgItem(hwnd, IDC_SELECTMODE), BM_SETIMAGE, IMAGE_ICON, (LPARAM)Skin_GetIcon("CLN_CLVM_select"));

 		{

 			bool bSkinned = cfg::getByte("CLCExt", "bskinned", 0) != 0;

 			for (int i = 0; _buttons[i] != 0; i++ )

@@ -1097,7 +1097,7 @@ void CreateViewModeFrame()
     frame.align = alBottom;

     frame.hWnd = CreateWindowEx(0, _T("CLVMFrameWindow"), _T("CLVM"), WS_VISIBLE | WS_CHILD | WS_TABSTOP | WS_CLIPCHILDREN, 0, 0, 20, 20, pcli->hwndContactList, (HMENU) 0, g_hInst, NULL);

     g_hwndViewModeFrame = frame.hWnd;

-    hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&frame,(LPARAM)0);

+    hCLVMFrame = (HWND)CallService(MS_CLIST_FRAMES_ADDFRAME,(WPARAM)&frame,0);

     CallService(MS_CLIST_FRAMES_UPDATEFRAME, (WPARAM)hCLVMFrame, FU_FMPOS);

 }

 

@@ -1245,5 +1245,3 @@ void ApplyViewMode(const char *name)
 

     cfg::writeString(NULL, "CList", "LastViewMode", cfg::dat.current_viewmode);

 }

-

-