3 files changed, 6 insertions, 5 deletions
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;