final switch to the typed icolib api

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

3 files changed, 41 insertions, 41 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