4 files changed, 4 insertions, 4 deletions
diff --git a/src/mir_app/src/genmenu.h b/src/mir_app/src/genmenu.h
index aedc4229d0..a56934e0fc 100644
--- a/src/mir_app/src/genmenu.h
+++ b/src/mir_app/src/genmenu.h
@@ -95,7 +95,7 @@ struct TIntMenuObject : public MZeroedObject
 
 	TMO_LinkedList m_items;
 	HIMAGELIST m_hMenuIcons;
-	BOOL m_bUseUserDefinedItems;
+	bool m_bUseUserDefinedItems;
 
 	void freeItem(TMO_IntMenuItem*);
 };
diff --git a/src/mir_app/src/menu_options.cpp b/src/mir_app/src/menu_options.cpp
index c4d9380c7a..00a5a63974 100644
--- a/src/mir_app/src/menu_options.cpp
+++ b/src/mir_app/src/menu_options.cpp
@@ -243,7 +243,7 @@ class CGenMenuOptionsPage : public CDlgBase
 
 		m_menuItems.SendMsg(WM_SETREDRAW, TRUE, 0);
 
-		ShowWindow(m_warning.GetHwnd(), (pmo->m_bUseUserDefinedItems) ? SW_HIDE : SW_SHOW);
+		m_warning.Show(!pmo->m_bUseUserDefinedItems);
 		m_menuItems.Enable(pmo->m_bUseUserDefinedItems);
 		m_btnInsSeparator.Enable(pmo->m_bUseUserDefinedItems);
 		m_btnInsMenu.Enable(pmo->m_bUseUserDefinedItems);
diff --git a/src/mir_app/src/menu_utils.cpp b/src/mir_app/src/menu_utils.cpp
index b054c72631..a9b2b9c612 100644
--- a/src/mir_app/src/menu_utils.cpp
+++ b/src/mir_app/src/menu_utils.cpp
@@ -532,7 +532,7 @@ MIR_APP_DLL(int) Menu_ConfigureObject(int hMenuObject, int setting, INT_PTR valu
 			return true;
 
 		case MCO_OPT_USERDEFINEDITEMS:
-			pmo->m_bUseUserDefinedItems = (BOOL)value;
+			pmo->m_bUseUserDefinedItems = value != 0;
 			return true;
 		}
 	}
diff --git a/src/mir_app/src/srmm_util.cpp b/src/mir_app/src/srmm_util.cpp
index 2bd064d1ad..482e3c3fb0 100644
--- a/src/mir_app/src/srmm_util.cpp
+++ b/src/mir_app/src/srmm_util.cpp
@@ -73,7 +73,7 @@ MIR_APP_DLL(DWORD) CALLBACK Srmm_MessageStreamCallback(DWORD_PTR dwCookie, LPBYT
 	return 0;
 }
 
-MIR_APP_DLL(int) Srmm_GetWindowData(WPARAM hContact, MessageWindowData &mwd)
+MIR_APP_DLL(int) Srmm_GetWindowData(MCONTACT hContact, MessageWindowData &mwd)
 {
 	if (hContact == 0)
 		return 1;