rest of genmenu api died

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

43 files changed, 127 insertions, 129 deletions

diff --git a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
index 5db1b10683..f9483e7bd1 100644
--- a/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
+++ b/plugins/ClientChangeNotify/src/ClientChangeNotify.cpp
@@ -56,10 +56,10 @@ static int CALLBACK MenuWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 {

 	switch (uMsg) {

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 	}

 	return DefWindowProc(hWnd, uMsg, wParam, lParam);

 }

diff --git a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
index 7f8f7269e1..94543dbc94 100644
--- a/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/cluiframes.cpp
@@ -2679,10 +2679,10 @@ static LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam
 		return FALSE;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_USER + 100:

 		return 1;

diff --git a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
index 35e6b95a7f..fc512f7ea9 100644
--- a/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/framesmenu.cpp
@@ -65,7 +65,7 @@ INT_PTR FrameMenuCheckService(WPARAM wParam, LPARAM)
 		return FALSE;

 

 	TMO_MenuItem mi;

-	if (CallService(MO_GETMENUITEM, (WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {

+	if (Menu_GetItemInfo(pcpp->MenuItemHandle, mi) == 0) {

 		lpFrameMenuExecParam fmep = (lpFrameMenuExecParam)mi.ownerdata;

 		if (fmep != NULL) {

 			//pcpp->wParam  -  frameid

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 3e8532ba70..8ab38f6e47 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -2442,7 +2442,7 @@ LRESULT CLUI::OnContextMenu(UINT, WPARAM, LPARAM lParam)
 	return FALSE;

 }

 

-LRESULT CLUI::OnMeasureItem(UINT, WPARAM wParam, LPARAM lParam)

+LRESULT CLUI::OnMeasureItem(UINT, WPARAM, LPARAM lParam)

 {

 	LPMEASUREITEMSTRUCT pmis = (LPMEASUREITEMSTRUCT)lParam;

 	switch (pmis->itemData) {

@@ -2461,10 +2461,10 @@ LRESULT CLUI::OnMeasureItem(UINT, WPARAM wParam, LPARAM lParam)
 		ReleaseDC(m_hWnd, hdc);

 		return TRUE;

 	}

-	return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+	return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 }

 

-LRESULT CLUI::OnDrawItem(UINT, WPARAM wParam, LPARAM lParam)

+LRESULT CLUI::OnDrawItem(UINT, WPARAM, LPARAM lParam)

 {

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

 	LPDRAWITEMSTRUCT dis = (LPDRAWITEMSTRUCT)lParam;

@@ -2539,7 +2539,7 @@ LRESULT CLUI::OnDrawItem(UINT, WPARAM wParam, LPARAM lParam)
 		nMirMenuState = dis->itemState;

 	}

 

-	return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+	return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 }

 

 LRESULT CLUI::OnDestroy(UINT, WPARAM, LPARAM)

diff --git a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
index 4dcb13a226..011221b82a 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/cluiframes.cpp
@@ -2360,10 +2360,12 @@ LRESULT CALLBACK CLUIFrameTitleBarProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 	switch (msg) {
 	case WM_CREATE:
 		return FALSE;
+
 	case WM_MEASUREITEM:
-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
+
 	case WM_DRAWITEM:
-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 
 	case WM_ENABLE:
 		if (hwnd != 0) InvalidateRect(hwnd, NULL, FALSE);
diff --git a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
index d013caefd9..3b7d343b8f 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/framesmenu.cpp
@@ -66,7 +66,7 @@ INT_PTR FrameMenuCheckService(WPARAM wParam, LPARAM)
 		return FALSE;

 

 	TMO_MenuItem mi;

-	if (CallService(MO_GETMENUITEM, (WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {

+	if (Menu_GetItemInfo(pcpp->MenuItemHandle, mi) == 0) {

 		lpFrameMenuExecParam fmep = (lpFrameMenuExecParam)mi.ownerdata;

 		if (fmep != NULL) {

 			//pcpp->wParam  -  frameid

diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index dd77bc9232..d05cd7e509 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -229,7 +229,7 @@ void InitGroupMenus(void)
 

 	InitSubGroupMenus();

 

-	//Group menu

+	// Group menu

 	hGroupMenuObject = Menu_AddObject("GroupMenu", LPGEN("Group menu"), 0, "CLISTMENUSGroup/ExecService");

 	Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_USERDEFINEDITEMS, TRUE);

 	Menu_ConfigureObject(hGroupMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSGroup/FreeOwnerDataGroupMenu");

@@ -476,46 +476,44 @@ void InitSubGroupMenus(void)
 	Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_FREE_SERVICE, "CLISTMENUSSubGroup/FreeOwnerDataSubGroupMenu");

 	Menu_ConfigureObject(hSubGroupMenuObject, MCO_OPT_ONADD_SERVICE, "CLISTMENUSSubGroup/SubGroupMenuonAddService");

 

-	{

-		//add  exit command to menu

-		GroupMenuParam gmp;

-

-		CLISTMENUITEM mi = { 0 };

-		mi.position = 1000;

-		mi.icolibItem = iconItem[0].hIcolib;

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&New subgroup");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_NEWSUBGROUP;

-		hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-

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

-		mi.position = 1001;

-		mi.hIcon = NULL;

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&Hide offline users in here");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_GROUPHIDEOFFLINE;

-		hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-

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

-		mi.position = 900001;

-		mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_RENAME);

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&Rename group");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_RENAMEGROUP;

-		AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-

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

-		mi.position = 900002;

-		mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

-		mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

-		mi.pszName = LPGEN("&Delete group");

-		gmp.lParam = 0;

-		gmp.wParam = POPUP_DELETEGROUP;

-		AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

-	}

+	// add exit command to menu

+	GroupMenuParam gmp;

+

+	CLISTMENUITEM mi = { 0 };

+	mi.position = 1000;

+	mi.icolibItem = iconItem[0].hIcolib;

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&New subgroup");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_NEWSUBGROUP;

+	hNewSubGroupMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

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

+	mi.position = 1001;

+	mi.hIcon = NULL;

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&Hide offline users in here");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_GROUPHIDEOFFLINE;

+	hHideOfflineUsersHereMenuItem = (HGENMENU)AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

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

+	mi.position = 900001;

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_RENAME);

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&Rename group");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_RENAMEGROUP;

+	AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

+

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

+	mi.position = 900002;

+	mi.icolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE);

+	mi.pszService = "CLISTMENUSSubGroup/GroupMenuExecProxy";

+	mi.pszName = LPGEN("&Delete group");

+	gmp.lParam = 0;

+	gmp.wParam = POPUP_DELETEGROUP;

+	AddSubGroupMenuItem((WPARAM)&gmp, (LPARAM)&mi);

 }

 

 //////////////////////////////END SubGroup MENU/////////////////////////

diff --git a/plugins/Clist_nicer/src/clui.cpp b/plugins/Clist_nicer/src/clui.cpp
index 810855072a..753a30e51d 100644
--- a/plugins/Clist_nicer/src/clui.cpp
+++ b/plugins/Clist_nicer/src/clui.cpp
@@ -1654,7 +1654,7 @@ buttons_done:
 			((LPMEASUREITEMSTRUCT)lParam)->itemHeight = 0;
 			return TRUE;
 		}
-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
 
 	case WM_DRAWITEM:
 		{
@@ -1754,7 +1754,7 @@ buttons_done:
 			else if (dis->CtlType == ODT_MENU) {
 				if (dis->itemData == MENU_MIRANDAMENU)
 					break;
-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 			}
 		}
 		return 0;
diff --git a/plugins/ContactsPlus/src/receive.cpp b/plugins/ContactsPlus/src/receive.cpp
index 798d3d44d0..d14df1492f 100644
--- a/plugins/ContactsPlus/src/receive.cpp
+++ b/plugins/ContactsPlus/src/receive.cpp
@@ -466,11 +466,11 @@ INT_PTR CALLBACK RecvDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		break;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		DrawProtocolIcon(hwndDlg, lParam, wndData->mhContact);

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_SIZE:

 		if (!IsIconic(hwndDlg)) // make the dlg resizeable

diff --git a/plugins/ContactsPlus/src/send.cpp b/plugins/ContactsPlus/src/send.cpp
index f06309e72b..f5aaf412e7 100644
--- a/plugins/ContactsPlus/src/send.cpp
+++ b/plugins/ContactsPlus/src/send.cpp
@@ -444,11 +444,11 @@ INT_PTR CALLBACK SendDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPara
 		break;

 	

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		DrawProtocolIcon(hwndDlg, lParam, wndData->hContact);

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case DM_UPDATETITLE:

 		UpdateDialogTitle(hwndDlg, wndData ? wndData->hContact : NULL, TranslateT("Send Contacts to"));

diff --git a/plugins/Dropbox/src/dropbox_menus.cpp b/plugins/Dropbox/src/dropbox_menus.cpp
index 9255a758ed..432bd211ec 100644
--- a/plugins/Dropbox/src/dropbox_menus.cpp
+++ b/plugins/Dropbox/src/dropbox_menus.cpp
@@ -29,7 +29,7 @@ int CDropbox::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 	if (!hContact)

 		return 0;

 

-	BOOL bShow = FALSE;

+	bool bShow = false;

 

 	if (HasAccessToken() && !hTransferContact && hContact != GetDefaultContact())

 	{

@@ -41,7 +41,7 @@ int CDropbox::OnPrebuildContactMenu(WPARAM hContact, LPARAM)
 			WORD status = db_get_w(hContact, proto, "Status", ID_STATUS_OFFLINE);

 			bool canSendOffline = (CallProtoService(proto, PS_GETCAPS, PFLAGNUM_4, 0) & PF4_IMSENDOFFLINE) > 0;

 			if (isProtoOnline && (status != ID_STATUS_OFFLINE || canSendOffline))

-				bShow = TRUE;

+				bShow = true;

 		}

 	}

 

diff --git a/plugins/FTPFileYM/src/common.h b/plugins/FTPFileYM/src/common.h
index 74a23391d3..aca753f605 100644
--- a/plugins/FTPFileYM/src/common.h
+++ b/plugins/FTPFileYM/src/common.h
@@ -33,6 +33,7 @@ using namespace std;
 #include <m_button.h>

 #include <m_clist.h>

 #include <m_utils.h>

+#include <m_genmenu.h>

 #include <m_hotkeys.h>

 #include <m_icolib.h>

 #include <m_message.h>

diff --git a/plugins/FTPFileYM/src/dialog.cpp b/plugins/FTPFileYM/src/dialog.cpp
index c16bd30ea5..afe0f4131c 100644
--- a/plugins/FTPFileYM/src/dialog.cpp
+++ b/plugins/FTPFileYM/src/dialog.cpp
@@ -222,13 +222,11 @@ INT_PTR CALLBACK UploadDialog::UploadDlgProc(HWND hwndDlg, UINT msg, WPARAM wPar
 			break;

 		}

 		case WM_MEASUREITEM:

-		{

-			return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

-		}

+			return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

+

 		case WM_DRAWITEM:

-		{

-			return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

-		}

+			return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

+

 		case WM_COMMAND:

 		{

 			MCONTACT hContact = uDlg->tabs[uDlg->activeTab]->job->hContact;

diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp
index 7481d07879..f4aca7de25 100644
--- a/plugins/FavContacts/src/menu.cpp
+++ b/plugins/FavContacts/src/menu.cpp
@@ -368,7 +368,7 @@ static LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam,
 			return FALSE;

 

 		if ((lpmis->itemID >= CLISTMENUIDMIN) && (lpmis->itemID <= CLISTMENUIDMAX))

-			return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+			return Menu_MeasureItem(lpmis);

 

 		return MenuMeasureItem(lpmis);

 	}

@@ -380,7 +380,7 @@ static LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam,
 			return FALSE;

 

 		if ((lpdis->itemID >= CLISTMENUIDMIN) && (lpdis->itemID <= CLISTMENUIDMAX))

-			return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+			return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 		return MenuDrawItem(lpdis);

 	}

diff --git a/plugins/FloatingContacts/src/main.cpp b/plugins/FloatingContacts/src/main.cpp
index 8f6ad70b15..38aeeeee45 100644
--- a/plugins/FloatingContacts/src/main.cpp
+++ b/plugins/FloatingContacts/src/main.cpp
@@ -382,11 +382,11 @@ static LRESULT __stdcall CommWndProc(HWND	hwnd, UINT uMsg, WPARAM wParam, LPARAM
 		}

 

 	case WM_MEASUREITEM:

-		CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 		break;

 

 	case WM_DRAWITEM:

-		CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 		break;

 

 	case WM_LBUTTONDOWN:

diff --git a/plugins/HistoryStats/src/settings.cpp b/plugins/HistoryStats/src/settings.cpp
index a9c2b6ec06..730db1a4ee 100644
--- a/plugins/HistoryStats/src/settings.cpp
+++ b/plugins/HistoryStats/src/settings.cpp
@@ -21,7 +21,7 @@ Settings::CharMapper::CharMapper(const Settings& settings)
 	}

 

 	LCID lcid = GetUserDefaultLCID();

-	int  len = LCMapString(

+	LCMapString(

 		lcid, LCMAP_LINGUISTIC_CASING | LCMAP_LOWERCASE,

 		m_CharMap + 1, array_len(m_CharMap) - 1,

 		m_CharMap + 1, array_len(m_CharMap) - 1);

diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index 38a1623905..377afc4547 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -57,7 +57,7 @@ INT_PTR MirOTRMenuCheckService(WPARAM wParam, LPARAM)
 	TrustLevel level = (TrustLevel)otr_context_get_trust(context);
 
 	TMO_MenuItem mi;
-	if (CallService(MO_GETMENUITEM, (WPARAM)pcpp->MenuItemHandle, (LPARAM)&mi) == 0) {
+	if (Menu_GetItemInfo(pcpp->MenuItemHandle, mi) == 0) {
 		if (mi.flags & CMIF_HIDDEN) return FALSE;
 		if (mi.flags & CMIF_NOTPRIVATE  && level == TRUST_PRIVATE) return FALSE;
 		if (mi.flags & CMIF_NOTFINISHED && level == TRUST_FINISHED) return FALSE;
@@ -111,7 +111,7 @@ INT_PTR OnAddMenuItemMirOTRMenu(WPARAM wParam, LPARAM lParam)
 		return 0;
 
 	TMO_MenuItem mi;
-	if (CallService(MO_GETMENUITEM, (WPARAM)lParam, (LPARAM)&mi) == 0) {
+	if (Menu_GetItemInfo((HGENMENU)lParam, mi) == 0) {
 		if (mi.flags & CMIF_DISABLED) {
 			mii->fMask |= MIIM_STATE;
 			mii->fState |= MF_DISABLED;
@@ -124,10 +124,10 @@ LRESULT CALLBACK PopupMenuWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 {
 	switch (message) {
 	case WM_MEASUREITEM:
-		if (CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam)) return TRUE;
+		if (Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam)) return TRUE;
 		break;
 	case WM_DRAWITEM:
-		if (CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam)) return TRUE;
+		if (Menu_DrawItem((LPDRAWITEMSTRUCT)lParam)) return TRUE;
 		break;
 	case WM_COMMAND:
 		if (Menu_ProcessCommandById(wParam, GetWindowLongPtr(hwnd, GWLP_USERDATA)))
diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index e2e4884cb9..c7a9b9480a 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -1694,10 +1694,10 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 		break;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_CONTEXTMENU:

 		proto = protocols->Get(data->protocol_number);

diff --git a/plugins/NewAwaySysMod/src/ContactList.cpp b/plugins/NewAwaySysMod/src/ContactList.cpp
index 8d7784a42e..6b5e192793 100644
--- a/plugins/NewAwaySysMod/src/ContactList.cpp
+++ b/plugins/NewAwaySysMod/src/ContactList.cpp
@@ -284,12 +284,12 @@ static LRESULT CALLBACK ContactListSubclassProc(HWND hWnd, UINT Msg, WPARAM wPar
 

 	case WM_MEASUREITEM:

 		if (!wParam) // if the message was sent by a menu

-			return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+			return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 		break;

 

 	case WM_DRAWITEM:

 		if (!wParam) // if the message was sent by a menu

-			return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+			return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 		break;

 

 	case WM_CONTEXTMENU:

diff --git a/plugins/NewAwaySysMod/src/Notification.cpp b/plugins/NewAwaySysMod/src/Notification.cpp
index 6527a0731b..c25182270e 100644
--- a/plugins/NewAwaySysMod/src/Notification.cpp
+++ b/plugins/NewAwaySysMod/src/Notification.cpp
@@ -41,10 +41,10 @@ static int CALLBACK MenuWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lPar
 {

 	switch (uMsg) {

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 	}

 	return DefWindowProc(hWnd, uMsg, wParam, lParam);

 }

diff --git a/plugins/NewXstatusNotify/src/popup.cpp b/plugins/NewXstatusNotify/src/popup.cpp
index fd1127dae2..336b88f267 100644
--- a/plugins/NewXstatusNotify/src/popup.cpp
+++ b/plugins/NewXstatusNotify/src/popup.cpp
@@ -155,10 +155,10 @@ LRESULT CALLBACK PopupDlgProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM lPa
 

 	switch (message) {

 	case WM_MEASUREITEM: //Needed by the contact's context menu

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM: //Needed by the contact's context menu

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_COMMAND:

 		//This one returns TRUE if it processed the menu command, and FALSE if it did not process it.

diff --git a/plugins/NewsAggregator/Src/Services.cpp b/plugins/NewsAggregator/Src/Services.cpp
index a37fbf5ac0..ff5a09c348 100644
--- a/plugins/NewsAggregator/Src/Services.cpp
+++ b/plugins/NewsAggregator/Src/Services.cpp
@@ -229,8 +229,6 @@ INT_PTR NewsAggrRecvMessage(WPARAM, LPARAM lParam)
 

 void UpdateMenu(bool State)

 {

-	CLISTMENUITEM mi = { 0 };

-

 	if (!State) // to enable auto-update

 		Menu_ModifyItem(hService2[0], LPGENT("Auto Update Enabled"), GetIconHandle("enabled"));

 	else  // to disable auto-update

diff --git a/plugins/Popup/src/headers.h b/plugins/Popup/src/headers.h
index 56b8d1b625..4db076f80a 100644
--- a/plugins/Popup/src/headers.h
+++ b/plugins/Popup/src/headers.h
@@ -76,6 +76,7 @@ http://miranda-ng.org/distr/
 #include <m_addcontact.h>

 #include <m_clc.h>

 #include <m_icolib.h>

+#include <m_genmenu.h>

 #include <m_hotkeys.h>

 #include <m_fontservice.h>

 #include <m_avatars.h>

diff --git a/plugins/Popup/src/popup_wnd2.cpp b/plugins/Popup/src/popup_wnd2.cpp
index f31013e2e6..31dc8a4962 100644
--- a/plugins/Popup/src/popup_wnd2.cpp
+++ b/plugins/Popup/src/popup_wnd2.cpp
@@ -1317,10 +1317,10 @@ LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam, LPARAM
 		break;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 	}

 

 	return DefWindowProc(hwnd, message, wParam, lParam);

diff --git a/plugins/QuickContacts/src/commons.h b/plugins/QuickContacts/src/commons.h
index 98e8b0d5dd..e308aab019 100644
--- a/plugins/QuickContacts/src/commons.h
+++ b/plugins/QuickContacts/src/commons.h
@@ -30,6 +30,7 @@ Boston, MA 02111-1307, USA.
 #include <m_clist.h>

 #include <m_message.h>

 #include <m_userinfo.h>

+#include <m_genmenu.h>

 #include <m_skin.h>

 #include <m_langpack.h>

 #include <m_database.h>

diff --git a/plugins/QuickContacts/src/quickcontacts.cpp b/plugins/QuickContacts/src/quickcontacts.cpp
index 97cbccc467..9f52e186bd 100644
--- a/plugins/QuickContacts/src/quickcontacts.cpp
+++ b/plugins/QuickContacts/src/quickcontacts.cpp
@@ -999,9 +999,8 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			if(lpdis->CtlID != IDC_USERNAME) 

 			{

 				if (lpdis->CtlType == ODT_MENU)

-					return CallService(MS_CLIST_MENUDRAWITEM,wParam,lParam);

-				else

-					break;

+					return Menu_DrawItem(lpdis);

+				break;

 			}

 

 			// Handle combo

@@ -1094,12 +1093,10 @@ static INT_PTR CALLBACK MainDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LPARA
 			LPMEASUREITEMSTRUCT lpmis = (LPMEASUREITEMSTRUCT)lParam;

 

 			// Handle contact menu

-			if(lpmis->CtlID != IDC_USERNAME) 

-			{

+			if(lpmis->CtlID != IDC_USERNAME) {

 				if (lpmis->CtlType == ODT_MENU)

-					return CallService(MS_CLIST_MENUMEASUREITEM,wParam,lParam);

-				else

-					break;

+					return Menu_MeasureItem(lpmis);

+				break;

 			}

 

 			// Handle combo

diff --git a/plugins/RecentContacts/src/RecentContacts.cpp b/plugins/RecentContacts/src/RecentContacts.cpp
index c097b42bd5..fdad9f0104 100644
--- a/plugins/RecentContacts/src/RecentContacts.cpp
+++ b/plugins/RecentContacts/src/RecentContacts.cpp
@@ -342,10 +342,10 @@ INT_PTR CALLBACK ShowListMainDlgProc(HWND hDlg, UINT msg, WPARAM wParam, LPARAM
 		}

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_COMMAND:

 		if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)DlgDat->hContact))

diff --git a/plugins/SMS/src/SMS_svc.cpp b/plugins/SMS/src/SMS_svc.cpp
index 0b897825c1..b2d2d5f340 100644
--- a/plugins/SMS/src/SMS_svc.cpp
+++ b/plugins/SMS/src/SMS_svc.cpp
@@ -54,7 +54,7 @@ int LoadModules(void)
 

 int SmsRebuildContactMenu(WPARAM wParam,LPARAM lParam)

 {

-	Menu_ShowItem(ssSMSSettings.hContactMenuItems[0], GetContactPhonesCount(wParam));

+	Menu_ShowItem(ssSMSSettings.hContactMenuItems[0], GetContactPhonesCount(wParam) != 0);

 	return 0;

 }

 

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 00f1cf85da..a01119de72 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -856,7 +856,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{

 			MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam;

 			if (mis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 		}

 		return FALSE;

 

@@ -864,7 +864,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{

 			DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;

 			if (dis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 		}

 		return FALSE;

 

@@ -1360,7 +1360,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 		if (!MeasureMenuItem(wParam, lParam)) {

 			MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam;

 			if (mis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 			int ih = GetTextPixelSize(_T("AQGgl'"), g_Settings.UserListFont, FALSE);

 			int ih2 = GetTextPixelSize(_T("AQGg'"), g_Settings.UserListHeadingsFont, FALSE);

@@ -1377,7 +1377,7 @@ static INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPAR
 		if (!DrawMenuItem(wParam, lParam)) {

 			DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;

 			if (dis->CtlType == ODT_MENU)

-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 			if (dis->CtlID == IDC_CHAT_LIST) {

 				int index = dis->itemID;

diff --git a/plugins/Scriver/src/infobar.cpp b/plugins/Scriver/src/infobar.cpp
index 1aa9bfcae4..027dc2dd47 100644
--- a/plugins/Scriver/src/infobar.cpp
+++ b/plugins/Scriver/src/infobar.cpp
@@ -263,7 +263,7 @@ static INT_PTR CALLBACK InfobarWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARA
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 	

 	case WM_LBUTTONDOWN:

 		SendMessage(idat->mwd->hwnd, WM_LBUTTONDOWN, wParam, lParam);

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index e2b3448e1b..aa95a35a46 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -1504,7 +1504,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 

 	case WM_MEASUREITEM:

 		if (!MeasureMenuItem(wParam, lParam))

-			return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+			return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 		return TRUE;

 

 	case WM_DRAWITEM:

@@ -1552,7 +1552,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_COMMAND:

 		if (!lParam && CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)dat->hContact))

diff --git a/plugins/Scriver/src/msgwindow.cpp b/plugins/Scriver/src/msgwindow.cpp
index 6a88b6ea87..c95aa5b503 100644
--- a/plugins/Scriver/src/msgwindow.cpp
+++ b/plugins/Scriver/src/msgwindow.cpp
@@ -881,7 +881,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 		return TRUE;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:

 		{

@@ -897,7 +897,7 @@ INT_PTR CALLBACK DlgProcParentWindow(HWND hwndDlg, UINT msg, WPARAM wParam, LPAR
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_COMMAND:

 		if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)dat->hContact))

diff --git a/plugins/SeenPlugin/src/history.cpp b/plugins/SeenPlugin/src/history.cpp
index 857719e78f..9bc055125f 100644
--- a/plugins/SeenPlugin/src/history.cpp
+++ b/plugins/SeenPlugin/src/history.cpp
@@ -198,10 +198,10 @@ INT_PTR CALLBACK HistoryDlgProc(HWND hwndDlg, UINT Message, WPARAM wparam, LPARA
 		return TRUE;

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wparam, lparam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lparam);

 

 	case WM_DRAWITEM:

-		return CallService(MS_CLIST_MENUDRAWITEM, wparam, lparam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lparam);

 

 	case WM_COMMAND:

 		hContact = (MCONTACT)GetWindowLongPtr(hwndDlg, GWLP_USERDATA);

diff --git a/plugins/SeenPlugin/src/seen.h b/plugins/SeenPlugin/src/seen.h
index 4a83833fe6..6808ca7683 100644
--- a/plugins/SeenPlugin/src/seen.h
+++ b/plugins/SeenPlugin/src/seen.h
@@ -34,6 +34,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 #include <newpluginapi.h>

 #include <m_database.h>

 #include <m_langpack.h>

+#include <m_genmenu.h>

 #include <m_skin.h>

 #include <m_userinfo.h>

 #include <m_clist.h>

diff --git a/plugins/TabSRMM/src/chat/window.cpp b/plugins/TabSRMM/src/chat/window.cpp
index a37f241b9d..4197ca245b 100644
--- a/plugins/TabSRMM/src/chat/window.cpp
+++ b/plugins/TabSRMM/src/chat/window.cpp
@@ -1509,7 +1509,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{
 			MEASUREITEMSTRUCT *mis = (MEASUREITEMSTRUCT *)lParam;
 			if (mis->CtlType == ODT_MENU)
-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
 		}
 		return FALSE;
 
@@ -1517,7 +1517,7 @@ static LRESULT CALLBACK NicklistSubclassProc(HWND hwnd, UINT msg, WPARAM wParam,
 		{
 			DRAWITEMSTRUCT *dis = (DRAWITEMSTRUCT *)lParam;
 			if (dis->CtlType == ODT_MENU)
-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 		}
 		return FALSE;
 
@@ -2121,7 +2121,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					mis->itemWidth = 6;
 					return TRUE;
 				}
-				return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);
+				return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);
 			}
 			mis->itemHeight = g_Settings.iNickListFontHeight;
 		}
@@ -2135,7 +2135,7 @@ INT_PTR CALLBACK RoomWndProc(HWND hwndDlg, UINT uMsg, WPARAM wParam, LPARAM lPar
 					DrawMenuItem(dis, (HICON)dis->itemData, 0);
 					return TRUE;
 				}
-				return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);
+				return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);
 			}
 
 			if (dis->CtlID == IDC_LIST) {
diff --git a/plugins/TabSRMM/src/container.cpp b/plugins/TabSRMM/src/container.cpp
index 8af158731f..f863d29df0 100644
--- a/plugins/TabSRMM/src/container.cpp
+++ b/plugins/TabSRMM/src/container.cpp
@@ -1603,10 +1603,10 @@ static INT_PTR CALLBACK DlgProcContainer(HWND hwndDlg, UINT msg, WPARAM wParam,
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_MEASUREITEM:

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case DM_QUERYCLIENTAREA:

 		{

diff --git a/plugins/TabSRMM/src/msgdialog.cpp b/plugins/TabSRMM/src/msgdialog.cpp
index 1d5a3f4f60..452252e78d 100644
--- a/plugins/TabSRMM/src/msgdialog.cpp
+++ b/plugins/TabSRMM/src/msgdialog.cpp
@@ -2570,7 +2570,7 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 				return TRUE;

 			}

 		}

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_NCHITTEST:

 		SendMessage(hwndContainer, WM_NCHITTEST, wParam, lParam);

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index ad4936ee95..614a5aa83d 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -1407,7 +1407,7 @@ void TSAPI HandlePasteAndSend(const TWindowData *dat)
 // draw various elements of the message window, like avatar(s), info panel fields

 // and the color formatting menu

 

-int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)

+int TSAPI MsgWindowDrawHandler(WPARAM, LPARAM lParam, TWindowData *dat)

 {

 	if (!dat)

 		return 0;

@@ -1604,7 +1604,7 @@ int TSAPI MsgWindowDrawHandler(WPARAM wParam, LPARAM lParam, TWindowData *dat)
 		return TRUE;

 	}

 

-	return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+	return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 }

 

 void TSAPI LoadThemeDefaults(TContainerData *pContainer)

diff --git a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
index 880ce91789..89acc46117 100644
--- a/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
+++ b/plugins/UserInfoEx/src/dlg_anniversarylist.cpp
@@ -498,10 +498,10 @@ class CAnnivList
 			break;

 

 		case WM_DRAWITEM:

-			return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+			return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 		case WM_MEASUREITEM:

-			return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+			return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 		case WM_WINDOWPOSCHANGING:

 			if (PtrIsValid(pDlg)) {

diff --git a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
index f8047def59..87b68032ac 100644
--- a/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
+++ b/plugins/UserInfoEx/src/ex_import/svc_ExImport.cpp
@@ -326,12 +326,13 @@ typedef struct
  *

  * @return	always 0

  **/

+

 INT_PTR svcExIm_Account_Service(WPARAM wParam, LPARAM lParam)

 {

 	ExImParam ExIm;

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

 	HWND hClist = (HWND)CallService(MS_CLUI_GETHWNDTREE,0,0);

-	lpStatusMenuExecParam smep = (lpStatusMenuExecParam)Menu_GetUserData((HGENMENU)lParam);

+	lpStatusMenuExecParam smep = (lpStatusMenuExecParam)Menu_GetItemData((HGENMENU)lParam);

 	ExIm.pszName = mir_strdup(smep->proto);

 	ExIm.Typ = EXIM_ACCOUNT;

 

diff --git a/plugins/UserInfoEx/src/mir_menuitems.cpp b/plugins/UserInfoEx/src/mir_menuitems.cpp
index 9d44263735..cd38f94387 100644
--- a/plugins/UserInfoEx/src/mir_menuitems.cpp
+++ b/plugins/UserInfoEx/src/mir_menuitems.cpp
@@ -298,7 +298,7 @@ void RebuildGroup()
 {

 	int flag = 0;

 	BYTE item = 0;

-	GroupMenuParam gmp = {0};

+	GroupMenuParam gmp = { 0 };

 

 	HGENMENU mhRoot = HGENMENU_ROOT;

 	HGENMENU mhExIm = HGENMENU_ROOT;

@@ -395,7 +395,7 @@ void RebuildSubGroup()
 {

 	int flag = 0;

 	BYTE item = 0;

-	GroupMenuParam gmp = {0};

+	GroupMenuParam gmp = { 0 };

 

 	HGENMENU mhRoot = HGENMENU_ROOT;

 	HGENMENU mhExIm = HGENMENU_ROOT;

diff --git a/plugins/Weather/src/weather_mwin.cpp b/plugins/Weather/src/weather_mwin.cpp
index 0e7ed6998f..cb88a50811 100644
--- a/plugins/Weather/src/weather_mwin.cpp
+++ b/plugins/Weather/src/weather_mwin.cpp
@@ -112,10 +112,10 @@ static LRESULT CALLBACK wndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPara
 		return FALSE;

 

 	case WM_MEASUREITEM:	//Needed by the contact's context menu

-		return CallService(MS_CLIST_MENUMEASUREITEM, wParam, lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM:	//Needed by the contact's context menu

-		return CallService(MS_CLIST_MENUDRAWITEM, wParam, lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 

 	case WM_NOTIFY:

 		if (((LPNMHDR)lParam)->code == NM_AVATAR_CHANGED)

diff --git a/plugins/Weather/src/weather_popup.cpp b/plugins/Weather/src/weather_popup.cpp
index 8e5397ac0d..30c4c2a78e 100644
--- a/plugins/Weather/src/weather_popup.cpp
+++ b/plugins/Weather/src/weather_popup.cpp
@@ -187,15 +187,15 @@ LRESULT CALLBACK PopupWndProc(HWND hWnd, UINT uMsg, WPARAM wParam, LPARAM lParam
 		CallService(MS_USERINFO_SHOWDIALOG, wParam, 0);

 

 	case WM_COMMAND:	 //Needed by the contact's context menu

-		if ( CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam),MPCF_CONTACTMENU), (LPARAM)hPopupContact))

+		if (CallService(MS_CLIST_MENUPROCESSCOMMAND, MAKEWPARAM(LOWORD(wParam), MPCF_CONTACTMENU), (LPARAM)hPopupContact))

 			break;

 		return FALSE;

 

 	case WM_MEASUREITEM: //Needed by the contact's context menu

-		return CallService(MS_CLIST_MENUMEASUREITEM,wParam,lParam);

+		return Menu_MeasureItem((LPMEASUREITEMSTRUCT)lParam);

 

 	case WM_DRAWITEM: //Needed by the contact's context menu

-		return CallService(MS_CLIST_MENUDRAWITEM,wParam,lParam);

+		return Menu_DrawItem((LPDRAWITEMSTRUCT)lParam);

 	}

 

 	return DefWindowProc(hWnd, uMsg, wParam, lParam);//FALSE;