fixes for MENUITEMINFO declarations

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

28 files changed, 100 insertions, 92 deletions

diff --git a/plugins/Alarms/src/alarm_win.cpp b/plugins/Alarms/src/alarm_win.cpp
index 1dc974e01f..f4f4708fe2 100644
--- a/plugins/Alarms/src/alarm_win.cpp
+++ b/plugins/Alarms/src/alarm_win.cpp
@@ -270,15 +270,15 @@ INT_PTR CALLBACK DlgProcAlarm(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lPar
 					ScreenToClient(hwndDlg,&pt_rel);

 

 					HMENU hMenu = CreatePopupMenu();

-					MENUITEMINFO mmi = {0};

-					mmi.cbSize = sizeof(mmi);

-					mmi.fMask = MIIM_ID | MIIM_STRING;

+					MENUITEMINFO mii = { 0 };

+					mii.cbSize = sizeof(mii);

+					mii.fMask = MIIM_ID | MIIM_STRING;

 

 #define AddItem(x)							\

-		mmi.wID++;							\

-		mmi.dwTypeData = TranslateT(x);		\

-		mmi.cch = ( UINT )mir_tstrlen(mmi.dwTypeData);	\

-		InsertMenuItem(hMenu, mmi.wID, FALSE, &mmi);

+		mii.wID++;							\

+		mii.dwTypeData = TranslateT(x);		\

+		mii.cch = ( UINT )mir_tstrlen(mii.dwTypeData);	\

+		InsertMenuItem(hMenu, mii.wID, FALSE, &mii);

 

 					AddItem(LPGEN("5 mins"));

 					AddItem(LPGEN("15 mins"));

diff --git a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
index 57cf2ac25f..188639ecf0 100644
--- a/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_modern/src/CLUIFrames/groupmenu.cpp
@@ -100,7 +100,6 @@ int GroupMenuCheckService(WPARAM, LPARAM)
 

 INT_PTR GroupMenuonAddService(WPARAM wParam, LPARAM lParam)

 {

-

 	MENUITEMINFO *mii = (MENUITEMINFO*)wParam;

 	if (mii == NULL)

 		return 0;

diff --git a/plugins/Clist_modern/src/modern_clistevents.cpp b/plugins/Clist_modern/src/modern_clistevents.cpp
index cabc2363da..db9139c4b6 100644
--- a/plugins/Clist_modern/src/modern_clistevents.cpp
+++ b/plugins/Clist_modern/src/modern_clistevents.cpp
@@ -105,7 +105,8 @@ CListEvent* cli_AddEvent(CLISTEVENT *cle)
 		return NULL;

 

 	if (p->cle.hContact != 0 && p->cle.hDbEvent != 1 && !(p->cle.flags & CLEF_ONLYAFEW)) {

-		MENUITEMINFO mii = { sizeof(mii) };

+		MENUITEMINFO mii = { 0 };

+		mii.cbSize = sizeof(mii);
 		mii.fMask = MIIM_DATA | MIIM_BITMAP | MIIM_ID;

 		if (p->cle.pszService &&

 			(!strncmp("SRMsg/ReadMessage", p->cle.pszService, _countof("SRMsg/ReadMessage")) ||

@@ -335,16 +336,13 @@ static int EventArea_DrawWorker(HWND hWnd, HDC hDC)
 	}

 	else if (iCount > 0) {

 		MENUITEMINFO mii = { 0 };

-		struct NotifyMenuItemExData *nmi;

-		TCHAR *szName;

-		int iIcon;

-

 		mii.cbSize = sizeof(mii);

 		mii.fMask = MIIM_DATA;

 		GetMenuItemInfo(g_CluiData.hMenuNotify, iCount - 1, TRUE, &mii);

-		nmi = (struct NotifyMenuItemExData *) mii.dwItemData;

-		szName = pcli->pfnGetContactDisplayName(nmi->hContact, 0);

-		iIcon = cli_GetContactIcon(nmi->hContact);

+		

+		NotifyMenuItemExData *nmi = (struct NotifyMenuItemExData *) mii.dwItemData;

+		TCHAR *szName = pcli->pfnGetContactDisplayName(nmi->hContact, 0);

+		int iIcon = cli_GetContactIcon(nmi->hContact);

 		ske_ImageList_DrawEx(g_himlCListClc, iIcon, hDC, rc.left, (rc.bottom + rc.top - GetSystemMetrics(SM_CYSMICON)) / 2, GetSystemMetrics(SM_CXSMICON), GetSystemMetrics(SM_CYSMICON), CLR_NONE, CLR_NONE, ILD_NORMAL);

 		rc.left += 18;

 		ske_ImageList_DrawEx(g_himlCListClc, nmi->iIcon, hDC, 4, (rc.bottom + rc.top) / 2 - 8, 16, 16, CLR_NONE, CLR_NONE, ILD_NORMAL);

@@ -488,13 +486,14 @@ static LRESULT CALLBACK EventArea_WndProc(HWND hwnd, UINT msg, WPARAM wParam, LP
 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NOTIFYBUTTON) {

 			int iSelection;

-			MENUITEMINFO mii = { 0 };

-			POINT pt;

 			struct NotifyMenuItemExData *nmi = 0;

 			int iCount = GetMenuItemCount(g_CluiData.hMenuNotify);

 			BOOL result;

 

+			POINT pt;

 			GetCursorPos(&pt);

+

+			MENUITEMINFO mii = { 0 };

 			mii.cbSize = sizeof(mii);

 			mii.fMask = MIIM_DATA;

 			if (iCount > 1)

diff --git a/plugins/Clist_modern/src/modern_clui.cpp b/plugins/Clist_modern/src/modern_clui.cpp
index 7970ff7f31..3e8532ba70 100644
--- a/plugins/Clist_modern/src/modern_clui.cpp
+++ b/plugins/Clist_modern/src/modern_clui.cpp
@@ -251,7 +251,8 @@ HRESULT CLUI::CreateCluiFrames()
 {

 	g_hMenuMain = GetMenu(pcli->hwndContactList);

 

-	MENUITEMINFO mii = { sizeof(mii) };

+	MENUITEMINFO mii = { 0 };

+	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_SUBMENU;

 	mii.hSubMenu = (HMENU)CallService(MS_CLIST_MENUGETMAIN, 0, 0);

 	SetMenuItemInfo(g_hMenuMain, 0, TRUE, &mii);

@@ -1912,7 +1913,8 @@ LRESULT CLUI::OnCreate(UINT, WPARAM, LPARAM)
 	DrawMenuBar(m_hWnd);

 	cliCluiProtocolStatusChanged(0, 0);

 

-	MENUITEMINFO mii = { sizeof(mii) };

+	MENUITEMINFO mii = { 0 };

+	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_TYPE | MIIM_DATA;

 	mii.dwItemData = MENU_MIRANDAMENU;

 	mii.fType = MFT_OWNERDRAW;

diff --git a/plugins/Clist_modern/src/modern_viewmodebar.cpp b/plugins/Clist_modern/src/modern_viewmodebar.cpp
index 5bd9b5db27..faea096349 100644
--- a/plugins/Clist_modern/src/modern_viewmodebar.cpp
+++ b/plugins/Clist_modern/src/modern_viewmodebar.cpp
@@ -1086,7 +1086,8 @@ LRESULT CALLBACK ViewModeFrameWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM
 						goto clvm_reset_command;

 

 					TCHAR szTemp[256];

-					MENUITEMINFO mii = { sizeof(mii) };

+					MENUITEMINFO mii = { 0 };

+					mii.cbSize = sizeof(mii);

 					mii.fMask = MIIM_STRING;

 					mii.dwTypeData = szTemp;

 					mii.cch = 256;

diff --git a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
index cbce3fa8a4..d203d954c9 100644
--- a/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
+++ b/plugins/Clist_nicer/src/CLUIFrames/groupmenu.cpp
@@ -108,7 +108,8 @@ INT_PTR GroupMenuCheckService(WPARAM, LPARAM)
 INT_PTR GroupMenuonAddService(WPARAM wParam, LPARAM lParam)

 {

 	MENUITEMINFO *mii = (MENUITEMINFO *)wParam;

-	if (mii == NULL) return 0;

+	if (mii == NULL)

+		return 0;

 

 	if (hHideShowMainMenuItem == (HANDLE)lParam) {

 		mii->fMask |= MIIM_STATE;

@@ -418,7 +419,8 @@ INT_PTR SubGroupMenuCheckService(WPARAM, LPARAM)
 INT_PTR SubGroupMenuonAddService(WPARAM wParam, LPARAM)

 {

 	MENUITEMINFO *mii = (MENUITEMINFO *)wParam;

-	if (mii == NULL) return 0;

+	if (mii == NULL)

+		return 0;

 

 	/*

 	if (hHideShowMainMenuItem == (HANDLE)lParam) {

diff --git a/plugins/Clist_nicer/src/clistevents.cpp b/plugins/Clist_nicer/src/clistevents.cpp
index 47fe8121d9..9d7e722d8b 100644
--- a/plugins/Clist_nicer/src/clistevents.cpp
+++ b/plugins/Clist_nicer/src/clistevents.cpp
@@ -158,20 +158,21 @@ LRESULT CALLBACK EventAreaWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPa
 	case WM_COMMAND:

 		if (LOWORD(wParam) == IDC_NOTIFYBUTTON) {

 			int iSelection;

-			MENUITEMINFO mii = { 0 };

-			POINT pt;

 			struct NotifyMenuItemExData *nmi = 0;

 			int iCount = GetMenuItemCount(cfg::dat.hMenuNotify);

-			BOOL result;

 

+			POINT pt;

 			GetCursorPos(&pt);

+

+			MENUITEMINFO mii = { 0 };

 			mii.cbSize = sizeof(mii);

 			mii.fMask = MIIM_DATA;

 			if (iCount > 1)

 				iSelection = TrackPopupMenu(cfg::dat.hMenuNotify, TPM_RETURNCMD, pt.x, pt.y, 0, hwnd, NULL);

 			else

 				iSelection = GetMenuItemID(cfg::dat.hMenuNotify, 0);

-			result = GetMenuItemInfo(cfg::dat.hMenuNotify, (UINT)iSelection, FALSE, &mii);

+			

+			BOOL result = GetMenuItemInfo(cfg::dat.hMenuNotify, (UINT)iSelection, FALSE, &mii);

 			if (result != 0) {

 				nmi = (struct NotifyMenuItemExData *) mii.dwItemData;

 				if (nmi) {

@@ -260,7 +261,8 @@ CListEvent* AddEvent(CLISTEVENT *cle)
 		return NULL;

 

 	if (p->cle.hContact != 0 && p->cle.hDbEvent != 1 && !(p->cle.flags & CLEF_ONLYAFEW)) {

-		MENUITEMINFO mii = { sizeof(mii) };

+		MENUITEMINFO mii = { 0 };

+		mii.cbSize = sizeof(mii);

 		mii.fMask = MIIM_DATA | MIIM_BITMAP | MIIM_ID;

 		if (p->cle.pszService && !strncmp("SRMsg/ReadMessage", p->cle.pszService, 17)) {

 			// dup check only for msg events

diff --git a/plugins/FavContacts/src/menu.cpp b/plugins/FavContacts/src/menu.cpp
index 2bb6fef449..7481d07879 100644
--- a/plugins/FavContacts/src/menu.cpp
+++ b/plugins/FavContacts/src/menu.cpp
@@ -413,7 +413,8 @@ static LRESULT CALLBACK MenuHostWndProc(HWND hwnd, UINT message, WPARAM wParam,
 		return MAKELRESULT(1, MNC_SELECT);

 

 	case WM_MENURBUTTONUP:

-		MENUITEMINFO mii = { sizeof(mii) };

+		MENUITEMINFO mii = { 0 };

+		mii.cbSize = sizeof(mii);

 		mii.fMask = MIIM_DATA;

 		GetMenuItemInfo((HMENU)lParam, wParam, TRUE, &mii);

 		MCONTACT hContact = (MCONTACT)mii.dwItemData;

diff --git a/plugins/MirOTR/src/mirotrmenu.cpp b/plugins/MirOTR/src/mirotrmenu.cpp
index 87807a5ee2..55dad23416 100644
--- a/plugins/MirOTR/src/mirotrmenu.cpp
+++ b/plugins/MirOTR/src/mirotrmenu.cpp
@@ -139,7 +139,8 @@ INT_PTR FreeOwnerDataMirOTRMenu(WPARAM, LPARAM lParam)
 INT_PTR OnAddMenuItemMirOTRMenu(WPARAM wParam, LPARAM lParam)
 {
 	MENUITEMINFO *mii = (MENUITEMINFO*)wParam;
-	if (!mii || mii->cbSize != sizeof(MENUITEMINFO)) return 0;
+	if (!mii || mii->cbSize != sizeof(MENUITEMINFO))
+		return 0;
 
 	TMO_MenuItem mi;
 	if (CallService(MO_GETMENUITEM, (WPARAM)lParam, (LPARAM)&mi) == 0) {
diff --git a/plugins/MyDetails/src/frame.cpp b/plugins/MyDetails/src/frame.cpp
index c967676e73..e2e4884cb9 100644
--- a/plugins/MyDetails/src/frame.cpp
+++ b/plugins/MyDetails/src/frame.cpp
@@ -1407,7 +1407,6 @@ void ShowProtocolStatusMenu(HWND hwnd, MyDetailsFrameData *data, Protocol *proto
 		int count = GetMenuItemCount(menu);

 		for (int i = 0; i < count && submenu == NULL; i++) {

 			MENUITEMINFO mii = { 0 };

-

 			mii.cbSize = sizeof(mii);

 			mii.fMask = MIIM_STRING;

 

@@ -1660,7 +1659,8 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 				HMENU menu = CreatePopupMenu();

 

 				for (int i = protocols->GetSize() - 1; i >= 0; i--) {

-					MENUITEMINFO mii = { sizeof(mii) };

+					MENUITEMINFO mii = { 0 };

+					mii.cbSize = sizeof(mii);

 					mii.fMask = MIIM_ID | MIIM_TYPE;

 					mii.fType = MFT_STRING;

 					mii.dwTypeData = protocols->Get(i)->description;

@@ -1886,11 +1886,9 @@ LRESULT CALLBACK FrameWindowProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lPar
 

 				// Add this proto to menu

 				TCHAR tmp[128];

-				MENUITEMINFO mii = { 0 };

-

 				mir_sntprintf(tmp, _countof(tmp), TranslateT("Enable listening to for %s"), proto->description);

 

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

+				MENUITEMINFO mii = { 0 };

 				mii.cbSize = sizeof(mii);

 				mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_STATE;

 				mii.fType = MFT_STRING;

diff --git a/plugins/NotesAndReminders/src/notes.cpp b/plugins/NotesAndReminders/src/notes.cpp
index 3f553dee1e..8ad6753abf 100644
--- a/plugins/NotesAndReminders/src/notes.cpp
+++ b/plugins/NotesAndReminders/src/notes.cpp
@@ -1833,15 +1833,14 @@ static void InitListView(HWND AHLV)
 
 static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,STICKYNOTE *pNote)
 {
-	HWND hwndListView;
-    HMENU hMenuLoad,FhMenu;
-	MENUITEMINFO mii;
-
-	hwndListView = (HWND)wParam;
-	if (hwndListView != GetDlgItem(AhWnd,IDC_LISTREMINDERS)) return FALSE;
-	hMenuLoad = LoadMenu(hinstance,"MNU_NOTELISTPOPUP");
-	FhMenu = GetSubMenu(hMenuLoad,0);
-
+	HWND hwndListView = (HWND)wParam;
+	if (hwndListView != GetDlgItem(AhWnd,IDC_LISTREMINDERS))
+		return FALSE;
+	
+	HMENU hMenuLoad = LoadMenu(hinstance,"MNU_NOTELISTPOPUP");
+	HMENU FhMenu = GetSubMenu(hMenuLoad,0);
+
+	MENUITEMINFO mii = { 0 };
 	mii.cbSize = sizeof(mii);
 	mii.fMask = MIIM_STATE;
 	mii.fState = MFS_DEFAULT;
diff --git a/plugins/NotesAndReminders/src/reminders.cpp b/plugins/NotesAndReminders/src/reminders.cpp
index 192ea34e5c..8e4238cff7 100644
--- a/plugins/NotesAndReminders/src/reminders.cpp
+++ b/plugins/NotesAndReminders/src/reminders.cpp
@@ -2343,7 +2343,7 @@ static BOOL DoListContextMenu(HWND AhWnd,WPARAM wParam,LPARAM lParam,REMINDERDAT
 	HMENU hMenuLoad = LoadMenu(hinstance, _T("MNU_REMINDERPOPUP"));

 	HMENU FhMenu = GetSubMenu(hMenuLoad, 0);

 

-	MENUITEMINFO mii;

+	MENUITEMINFO mii = { 0 };

 	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_STATE;

 	mii.fState = MFS_DEFAULT;

diff --git a/plugins/Scriver/src/chat/tools.cpp b/plugins/Scriver/src/chat/tools.cpp
index 280700fbcb..43aa5c669f 100644
--- a/plugins/Scriver/src/chat/tools.cpp
+++ b/plugins/Scriver/src/chat/tools.cpp
@@ -108,13 +108,13 @@ UINT CreateGCMenu(HWND hwnd, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO *s
 

 void DestroyGCMenu(HMENU *hMenu, int iIndex)

 {

-	MENUITEMINFO mi;

-	mi.cbSize = sizeof(mi);

-	mi.fMask = MIIM_SUBMENU;

-	while(GetMenuItemInfo(*hMenu, iIndex, TRUE, &mi))

+	MENUITEMINFO mii = { 0 };

+	mii.cbSize = sizeof(mii);

+	mii.fMask = MIIM_SUBMENU;

+	while(GetMenuItemInfo(*hMenu, iIndex, TRUE, &mii))

 	{

-		if (mi.hSubMenu != NULL)

-			DestroyMenu(mi.hSubMenu);

+		if (mii.hSubMenu != NULL)

+			DestroyMenu(mii.hSubMenu);

 		RemoveMenu(*hMenu, iIndex, MF_BYPOSITION);

 	}

 }

diff --git a/plugins/Scriver/src/chat/window.cpp b/plugins/Scriver/src/chat/window.cpp
index 1ad222c2d8..00f1cf85da 100644
--- a/plugins/Scriver/src/chat/window.cpp
+++ b/plugins/Scriver/src/chat/window.cpp
@@ -1920,7 +1920,8 @@ LABEL_SHOWWINDOW:
 	case WM_RBUTTONUP:

 		hToolbarMenu = CreatePopupMenu();

 		for (int i = 0; i < _countof(toolbarButtons); i++) {

-			MENUITEMINFO mii = { sizeof(mii) };

+			MENUITEMINFO mii = { 0 };

+			mii.cbSize = sizeof(mii);

 			mii.fMask = MIIM_ID | MIIM_STRING | MIIM_STATE | MIIM_DATA | MIIM_BITMAP;

 			mii.fType = MFT_STRING;

 			mii.fState = (g_dat.chatBbuttonVisibility & (1 << i)) ? MFS_CHECKED : MFS_UNCHECKED;

diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 5157c96e90..e2b3448e1b 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -927,7 +927,8 @@ INT_PTR CALLBACK DlgProcMessage(HWND hwndDlg, UINT msg, WPARAM wParam, LPARAM lP
 	case WM_RBUTTONUP:

 		hToolbarMenu = CreatePopupMenu();

 		for (int i = 0; i < _countof(toolbarButtons); i++) {

-			MENUITEMINFO mii = { sizeof(mii) };

+			MENUITEMINFO mii = { 0 };

+			mii.cbSize = sizeof(mii);

 			mii.fMask = MIIM_ID | MIIM_STRING | MIIM_STATE | MIIM_DATA | MIIM_BITMAP;

 			mii.fType = MFT_STRING;

 			mii.fState = (g_dat.buttonVisibility & (1 << i)) ? MFS_CHECKED : MFS_UNCHECKED;

diff --git a/plugins/Scriver/src/utils.cpp b/plugins/Scriver/src/utils.cpp
index 4e650afb20..e5ed4b3a45 100644
--- a/plugins/Scriver/src/utils.cpp
+++ b/plugins/Scriver/src/utils.cpp
@@ -407,11 +407,12 @@ void SearchWord(TCHAR * word, int engine)
 void SetSearchEngineIcons(HMENU hMenu, HIMAGELIST hImageList)

 {

 	for (int i = 0; i < IDI_LASTICON - IDI_GOOGLE; i++) {

-		MENUITEMINFO minfo = { sizeof(minfo) };

-		minfo.fMask = MIIM_BITMAP | MIIM_DATA;

-		minfo.hbmpItem = HBMMENU_CALLBACK;

-		minfo.dwItemData = (ULONG_PTR)hImageList;

-		SetMenuItemInfo(hMenu, IDM_SEARCH_GOOGLE + i, FALSE, &minfo);

+		MENUITEMINFO mii = { 0 };

+		mii.cbSize = sizeof(mii);

+		mii.fMask = MIIM_BITMAP | MIIM_DATA;

+		mii.hbmpItem = HBMMENU_CALLBACK;

+		mii.dwItemData = (ULONG_PTR)hImageList;

+		SetMenuItemInfo(hMenu, IDM_SEARCH_GOOGLE + i, FALSE, &mii);

 	}

 }

 

diff --git a/plugins/ShellExt/src/shlext.cpp b/plugins/ShellExt/src/shlext.cpp
index 780d7f86e3..a8d87632f1 100644
--- a/plugins/ShellExt/src/shlext.cpp
+++ b/plugins/ShellExt/src/shlext.cpp
@@ -319,8 +319,8 @@ grouploop:
 

 static void BuildMenuGroupTree(TGroupNode *p, TEnumData *lParam, HMENU hLastMenu)

 {

-	MENUITEMINFOA mii;

-	mii.cbSize = sizeof(MENUITEMINFO);

+	MENUITEMINFOA mii = { 0 };

+	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_ID | MIIM_DATA | MIIM_TYPE | MIIM_SUBMENU;

 

 	// go thru each group and create a menu for it adding submenus too.

@@ -398,7 +398,7 @@ static void BuildMenus(TEnumData *lParam)
 	}

 	

 	MENUITEMINFOA mii = { 0 };

-	mii.cbSize = sizeof(MENUITEMINFO);

+	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_ID | MIIM_TYPE | MIIM_DATA;

 	// add all the contacts that have no group (which maybe all of them)

 	pg = lParam->ipch->ContactsBegin;

@@ -467,7 +467,7 @@ static void BuildMenus(TEnumData *lParam)
 

 	// allocate display info/memory for "Miranda" string

 

-	mii.cbSize = sizeof(MENUITEMINFO);

+	mii.cbSize = sizeof(mii);

 	if (bIsVistaPlus)

 		mii.fMask = MIIM_ID | MIIM_DATA | MIIM_FTYPE | MIIM_SUBMENU | MIIM_STRING | MIIM_BITMAP;

 	else

@@ -738,8 +738,8 @@ HRESULT ipcGetFiles(THeaderIPC *pipch, IDataObject* pDataObject, MCONTACT hConta
 HRESULT RequestTransfer(TShellExt *Self, int idxCmd)

 {

 	// get the contact information

-	MENUITEMINFOA mii;

-	mii.cbSize = sizeof(MENUITEMINFO);

+	MENUITEMINFOA mii = { 0 };

+	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_ID | MIIM_DATA;

 	if ( !GetMenuItemInfoA(Self->hRootMenu, Self->idCmdFirst + idxCmd, false, &mii))

 		return E_INVALIDARG;

diff --git a/plugins/SpellChecker/src/utils.cpp b/plugins/SpellChecker/src/utils.cpp
index f712daa96d..83884c35ae 100644
--- a/plugins/SpellChecker/src/utils.cpp
+++ b/plugins/SpellChecker/src/utils.cpp
@@ -1047,8 +1047,8 @@ TCHAR *GetWordUnderPoint(Dialog *dlg, POINT pt, CHARRANGE &sel)
 

 void AppendSubmenu(HMENU hMenu, HMENU hSubMenu, TCHAR *name)

 {

-	MENUITEMINFO mii = { sizeof(mii) };

-	mii.cbSize = sizeof(MENUITEMINFO);

+	MENUITEMINFO mii = { 0 };

+	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_SUBMENU | MIIM_TYPE;

 	mii.fType = MFT_STRING;

 	mii.hSubMenu = hSubMenu;

@@ -1062,7 +1062,8 @@ void AppendMenuItem(HMENU hMenu, int id, TCHAR *name, HICON hIcon, BOOL checked)
 	ICONINFO iconInfo;

 	GetIconInfo(hIcon, &iconInfo);

 

-	MENUITEMINFO mii = { sizeof(mii) };

+	MENUITEMINFO mii = { 0 };

+	mii.cbSize = sizeof(mii);
 	mii.fMask = MIIM_CHECKMARKS | MIIM_TYPE | MIIM_STATE;

 	mii.fType = MFT_STRING;

 	mii.fState = (checked ? MFS_CHECKED : 0);

@@ -1456,7 +1457,7 @@ LRESULT CALLBACK MenuWndProc(HWND hwnd, UINT msg, WPARAM wParam, LPARAM lParam)
 					continue;

 

 				MENUITEMINFO mii = { 0 };

-				mii.cbSize = sizeof(MENUITEMINFO);

+				mii.cbSize = sizeof(mii);

 				mii.fMask = MIIM_STATE;

 				GetMenuItemInfo(hMenu, id, FALSE, &mii);

 

diff --git a/plugins/TabSRMM/src/chat/tools.cpp b/plugins/TabSRMM/src/chat/tools.cpp
index f9d2f56a46..c9e5e5cfd7 100644
--- a/plugins/TabSRMM/src/chat/tools.cpp
+++ b/plugins/TabSRMM/src/chat/tools.cpp
@@ -598,11 +598,12 @@ UINT CreateGCMenu(HWND hwndDlg, HMENU *hMenu, int iIndex, POINT pt, SESSION_INFO
 

 void DestroyGCMenu(HMENU *hMenu, int iIndex)

 {

-	MENUITEMINFO mi = { sizeof(MENUITEMINFO) };

-	mi.fMask = MIIM_SUBMENU;

-	while (GetMenuItemInfo(*hMenu, iIndex, TRUE, &mi)) {

-		if (mi.hSubMenu != NULL)

-			DestroyMenu(mi.hSubMenu);

+	MENUITEMINFO mii = { 0 };

+	mii.cbSize = sizeof(mii);

+	mii.fMask = MIIM_SUBMENU;

+	while (GetMenuItemInfo(*hMenu, iIndex, TRUE, &mii)) {

+		if (mii.hSubMenu != NULL)

+			DestroyMenu(mii.hSubMenu);

 		RemoveMenu(*hMenu, iIndex, MF_BYPOSITION);

 	}

 }

diff --git a/plugins/TabSRMM/src/eventpopups.cpp b/plugins/TabSRMM/src/eventpopups.cpp
index 0ed7ff9f4c..4074f5966c 100644
--- a/plugins/TabSRMM/src/eventpopups.cpp
+++ b/plugins/TabSRMM/src/eventpopups.cpp
@@ -702,7 +702,8 @@ int TSAPI UpdateTrayMenu(const TWindowData *dat, WORD wStatus, const char *szPro
 	WORD wMyStatus = (wStatus == 0) ? db_get_w(hContact, szProto, "Status", ID_STATUS_OFFLINE) : wStatus;

 	const TCHAR	*szMyStatus = (szStatus == NULL) ? pcli->pfnGetStatusModeDescription(wMyStatus, 0) : szStatus;

 

-	MENUITEMINFO mii = { sizeof(mii) };

+	MENUITEMINFO mii = { 0 };

+	mii.cbSize = sizeof(mii);

 	mii.fMask = MIIM_DATA | MIIM_ID | MIIM_BITMAP;

 	mii.wID = (UINT)hContact;

 	mii.hbmpItem = HBMMENU_CALLBACK;

diff --git a/plugins/TabSRMM/src/hotkeyhandler.cpp b/plugins/TabSRMM/src/hotkeyhandler.cpp
index 5c7faa7def..5d180f3694 100644
--- a/plugins/TabSRMM/src/hotkeyhandler.cpp
+++ b/plugins/TabSRMM/src/hotkeyhandler.cpp
@@ -302,7 +302,6 @@ LONG_PTR CALLBACK HotkeyHandlerDlgProc(HWND hwndDlg, UINT msg, WPARAM wParam, LP
 				BOOL iSelection = TrackPopupMenu(submenu, TPM_RETURNCMD, pt.x, pt.y, 0, hwndDlg, NULL);

 				if (iSelection) {

 					MENUITEMINFO mii = { 0 };

-

 					mii.cbSize = sizeof(mii);

 					mii.fMask = MIIM_DATA | MIIM_ID;

 					GetMenuItemInfo(submenu, (UINT_PTR)iSelection, FALSE, &mii);

diff --git a/plugins/TabSRMM/src/msgdlgutils.cpp b/plugins/TabSRMM/src/msgdlgutils.cpp
index 3925cde528..ad4936ee95 100644
--- a/plugins/TabSRMM/src/msgdlgutils.cpp
+++ b/plugins/TabSRMM/src/msgdlgutils.cpp
@@ -259,11 +259,12 @@ int TSAPI MsgWindowUpdateMenu(TWindowData *dat, HMENU submenu, int menuID)
 		EnableMenuItem(submenu, ID_TABMENU_CLEARSAVEDTABPOSITION, (M.GetDword(dat->hContact, "tabindex", -1) != -1) ? MF_ENABLED : MF_GRAYED);

 	}

 	else if (menuID == MENU_PICMENU) {

-		MENUITEMINFO mii = { 0 };

 		TCHAR *szText = NULL;

 		char  avOverride = (char)M.GetByte(dat->hContact, "hideavatar", -1);

 		HMENU visMenu = GetSubMenu(submenu, 0);

 		BOOL picValid = bInfoPanel ? (dat->hOwnPic != 0) : (dat->ace && dat->ace->hbmPic && dat->ace->hbmPic != PluginConfig.g_hbmUnknown);

+

+		MENUITEMINFO mii = { 0 };

 		mii.cbSize = sizeof(mii);

 		mii.fMask = MIIM_STRING;

 

diff --git a/plugins/TabSRMM/src/trayicon.cpp b/plugins/TabSRMM/src/trayicon.cpp
index 98fdaf9c06..2bea40a6ed 100644
--- a/plugins/TabSRMM/src/trayicon.cpp
+++ b/plugins/TabSRMM/src/trayicon.cpp
@@ -191,9 +191,8 @@ void TSAPI FlashTrayIcon(HICON hIcon)
 

 void TSAPI AddContactToFavorites(MCONTACT hContact, const TCHAR *szNickname, const char *szProto, TCHAR *szStatus, WORD wStatus, HICON hIcon, BOOL mode, HMENU hMenu)

 {

-	MENUITEMINFO	mii = { 0 };

-	TCHAR			szMenuEntry[80];

-	TCHAR			szFinalNick[100];

+	TCHAR szMenuEntry[80];

+	TCHAR	szFinalNick[100];

 

 	if (szNickname == NULL)

 		_tcsncpy_s(szFinalNick, pcli->pfnGetContactDisplayName(hContact, 0), _TRUNCATE);

@@ -216,6 +215,7 @@ void TSAPI AddContactToFavorites(MCONTACT hContact, const TCHAR *szNickname, con
 

 	PROTOACCOUNT *acc = Proto_GetAccount(szProto);

 	if (acc && acc->tszAccountName) {

+		MENUITEMINFO mii = { 0 };

 		mii.cbSize = sizeof(mii);

 		mir_sntprintf(szMenuEntry, _countof(szMenuEntry), _T("%s: %s (%s)"), acc->tszAccountName, szFinalNick, szStatus);

 		if (mode) {

@@ -236,9 +236,10 @@ void TSAPI AddContactToFavorites(MCONTACT hContact, const TCHAR *szNickname, con
 				AppendMenu(hMenu, MF_BYCOMMAND, (UINT_PTR)hContact, szMenuEntry);

 			}

 			else if (hMenu == PluginConfig.g_hMenuFavorites) {            // insert the item sorted...

-				MENUITEMINFO mii2 = { 0 };

 				TCHAR szBuffer[142];

 				int i, c = GetMenuItemCount(PluginConfig.g_hMenuFavorites);

+

+				MENUITEMINFO mii2 = { 0 };

 				mii2.fMask = MIIM_STRING;

 				mii2.cbSize = sizeof(mii2);

 				if (c == 0)

diff --git a/plugins/TabSRMM/src/utils.cpp b/plugins/TabSRMM/src/utils.cpp
index 68844d70d1..1bf9e30517 100644
--- a/plugins/TabSRMM/src/utils.cpp
+++ b/plugins/TabSRMM/src/utils.cpp
@@ -802,7 +802,7 @@ void Utils::getIconSize(HICON hIcon, int& sizeX, int& sizeY)
 // @param uID		the item command id

 // @param pos		zero-based position index

 

-void Utils::addMenuItem(const HMENU& m, MENUITEMINFO& mii, HICON hIcon, const TCHAR *szText, UINT uID, UINT pos)

+void Utils::addMenuItem(const HMENU& m, MENUITEMINFO &mii, HICON hIcon, const TCHAR *szText, UINT uID, UINT pos)

 {

 	mii.wID = uID;

 	mii.dwItemData = (ULONG_PTR)hIcon;

diff --git a/plugins/UserInfoEx/src/classPsTree.cpp b/plugins/UserInfoEx/src/classPsTree.cpp
index 15b6bf5f8a..033ce4c271 100644
--- a/plugins/UserInfoEx/src/classPsTree.cpp
+++ b/plugins/UserInfoEx/src/classPsTree.cpp
@@ -717,7 +717,6 @@ int CPsTree::EndLabelEdit(const BYTE bSave)
 void CPsTree::PopupMenu()
 {
 	HMENU hPopup;
-	MENUITEMINFO mii;
 	TVHITTESTINFO hti;
 	TVITEM tvi;
 	POINT pt;
@@ -726,7 +725,8 @@ void CPsTree::PopupMenu()
 	// init popup menu
 	if (!(hPopup = CreatePopupMenu()))
 		return;
-	memset(&mii, 0, sizeof(MENUITEMINFO));
+
+	MENUITEMINFO mii = { 0 };
 	mii.cbSize = sizeof(mii);
 	mii.fMask = MIIM_STRING|MIIM_ID;
 
diff --git a/plugins/UserInfoEx/src/ctrl_annivedit.cpp b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
index cf8a7ef0d7..25454e73c3 100644
--- a/plugins/UserInfoEx/src/ctrl_annivedit.cpp
+++ b/plugins/UserInfoEx/src/ctrl_annivedit.cpp
@@ -432,15 +432,14 @@ void CAnnivEditCtrl::OnMenuPopup()
 {

 	POINT pt = { 0, 0 };

 	RECT rc;

-	MENUITEMINFO mii;

 	HMENU hMenu;

 	WORD i;

 

 	if (hMenu = CreatePopupMenu()) {

 		SetFocus(_hBtnMenu);

 

-		memset(&mii, 0, sizeof(MENUITEMINFO));

-		mii.cbSize = sizeof(MENUITEMINFO);

+		MENUITEMINFO mii = { 0 };

+		mii.cbSize = sizeof(mii);

 		mii.fMask = MIIM_ID|MIIM_STRING|MIIM_STATE;

 

 		// insert the items

diff --git a/plugins/UserInfoEx/src/ctrl_contact.cpp b/plugins/UserInfoEx/src/ctrl_contact.cpp
index 7576bf10e6..b8780f5b7b 100644
--- a/plugins/UserInfoEx/src/ctrl_contact.cpp
+++ b/plugins/UserInfoEx/src/ctrl_contact.cpp
@@ -605,15 +605,14 @@ static LRESULT CALLBACK CtrlContactWndProc(HWND hwnd, UINT msg,	WPARAM wParam, L
 			if (HIWORD(wParam) == BN_CLICKED) {

 				POINT pt = { 0, 0 };

 				RECT rc;

-				MENUITEMINFO mii;

 				int i, nItems;

 				HMENU hMenu;

 

 				if (!(hMenu = CreatePopupMenu())) return 0;

 				SetFocus((HWND)lParam);

 

-				memset(&mii, 0, sizeof(MENUITEMINFO));

-				mii.cbSize = sizeof(MENUITEMINFO);

+				MENUITEMINFO mii = { 0 };

+				mii.cbSize = sizeof(mii);

 				mii.fMask = MIIM_ID|MIIM_STRING|MIIM_FTYPE|MIIM_STATE;

 				mii.fType = MFT_STRING;

 

diff --git a/plugins/UserInfoEx/src/psp_profile.cpp b/plugins/UserInfoEx/src/psp_profile.cpp
index c8773a3419..1cf4dfff49 100644
--- a/plugins/UserInfoEx/src/psp_profile.cpp
+++ b/plugins/UserInfoEx/src/psp_profile.cpp
@@ -1258,7 +1258,6 @@ INT_PTR CALLBACK PSPProcContactProfile(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR
 			case NM_RCLICK:

 				{

 					HMENU hMenu = CreatePopupMenu();

-					MENUITEMINFO mii;

 					MCONTACT hContact;

 					LVHITTESTINFO hi;

 					LPLCITEM pItem;

@@ -1274,8 +1273,8 @@ INT_PTR CALLBACK PSPProcContactProfile(HWND hDlg, UINT uMsg, WPARAM wParam, LPAR
 					pItem = ProfileList_GetItemData(((LPNMHDR)lParam)->hwndFrom, hi.iItem);

 

 					// insert menuitems

-					memset(&mii, 0, sizeof(MENUITEMINFO));

-					mii.cbSize = sizeof(MENUITEMINFO);

+					MENUITEMINFO mii = { 0 };					

+					mii.cbSize = sizeof(mii);

 					mii.fMask = MIIM_ID|MIIM_STRING;

 					// insert "Add" Menuitem

 					mii.wID = BTN_ADD_intEREST;