From feac2b1a6a79c9d0bb58b0825ec2a776b888f9ce Mon Sep 17 00:00:00 2001 From: George Hazan Date: Tue, 22 May 2018 18:00:57 +0300 Subject: m_genmenu.h unbound from hLangpack --- protocols/Discord/src/menus.cpp | 4 ++-- protocols/FacebookRM/src/theme.cpp | 4 ++-- protocols/Gadu-Gadu/src/gg.cpp | 4 ++-- protocols/Gadu-Gadu/src/groupchat.cpp | 2 +- protocols/Gadu-Gadu/src/image.cpp | 2 +- protocols/Gadu-Gadu/src/import.cpp | 2 +- protocols/Gadu-Gadu/src/links.cpp | 4 ++-- protocols/Gadu-Gadu/src/sessions.cpp | 2 +- protocols/IRCG/src/services.cpp | 4 ++-- protocols/IcqOscarJ/src/icq_menu.cpp | 2 +- protocols/IcqOscarJ/src/icq_xstatus.cpp | 4 ++-- protocols/JabberG/src/jabber_menu.cpp | 12 ++++++------ protocols/JabberG/src/jabber_privacy.cpp | 4 ++-- protocols/JabberG/src/jabber_xstatus.cpp | 2 +- protocols/MRA/src/Mra_menus.cpp | 6 +++--- protocols/MSN/src/msn_menu.cpp | 4 ++-- protocols/Sametime/src/conference.cpp | 2 +- protocols/Sametime/src/sametime_session.cpp | 2 +- protocols/SkypeWeb/src/skype_menus.cpp | 4 ++-- protocols/Steam/src/steam_menus.cpp | 4 ++-- protocols/Tox/src/tox_menus.cpp | 2 +- protocols/Twitter/src/proto.cpp | 2 +- protocols/Twitter/src/theme.cpp | 2 +- protocols/VKontakte/src/vk_proto.cpp | 2 +- 24 files changed, 41 insertions(+), 41 deletions(-) (limited to 'protocols') diff --git a/protocols/Discord/src/menus.cpp b/protocols/Discord/src/menus.cpp index a924264cc8..6fb53b5aa4 100644 --- a/protocols/Discord/src/menus.cpp +++ b/protocols/Discord/src/menus.cpp @@ -89,7 +89,7 @@ int CDiscordProto::OnMenuPrebuild(WPARAM hContact, LPARAM) void CDiscordProto::InitMenus() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolRoot(this); mi.flags = CMIF_UNMOVABLE; @@ -109,7 +109,7 @@ void CDiscordProto::InitMenus() Menu_AddProtoMenuItem(&mi, m_szModuleName); // Contact menu items - CMenuItem mi2; + CMenuItem mi2(g_plugin); mi2.pszService = "/LeaveGuild"; CreateProtoService(mi2.pszService, &CDiscordProto::OnMenuLeaveGuild); mi2.name.a = LPGEN("Leave guild"); diff --git a/protocols/FacebookRM/src/theme.cpp b/protocols/FacebookRM/src/theme.cpp index 8766622708..ec95b927b0 100644 --- a/protocols/FacebookRM/src/theme.cpp +++ b/protocols/FacebookRM/src/theme.cpp @@ -95,7 +95,7 @@ void InitContactMenus() { HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu); - CMenuItem mi; + CMenuItem mi(g_plugin); SET_UID(mi, 0x4f006492, 0x9fe5, 0x4d10, 0x88, 0xce, 0x47, 0x53, 0xba, 0x27, 0xe9, 0xc9); mi.position = -2000006000; @@ -193,7 +193,7 @@ int FacebookProto::OnPrebuildContactMenu(WPARAM wParam, LPARAM) void FacebookProto::OnBuildProtoMenu() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.position = 201001; mi.root = Menu_GetProtocolRoot(this); diff --git a/protocols/Gadu-Gadu/src/gg.cpp b/protocols/Gadu-Gadu/src/gg.cpp index d07093d226..943cd589f2 100644 --- a/protocols/Gadu-Gadu/src/gg.cpp +++ b/protocols/Gadu-Gadu/src/gg.cpp @@ -254,7 +254,7 @@ INT_PTR GaduProto::blockuser(WPARAM hContact, LPARAM) // void GaduProto::block_init() { - CMenuItem mi; + CMenuItem mi(g_plugin); SET_UID(mi, 0xc6169b8f, 0x53ab, 0x4242, 0xbe, 0x90, 0xe2, 0x4a, 0xa5, 0x73, 0x88, 0x32); mi.position = -500050000; mi.hIcolibItem = iconList[8].hIcolib; @@ -280,7 +280,7 @@ void GaduProto::OnBuildProtoMenu() { HGENMENU hRoot = Menu_GetProtocolRoot(this); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = hRoot; mi.flags = CMIF_UNICODE; diff --git a/protocols/Gadu-Gadu/src/groupchat.cpp b/protocols/Gadu-Gadu/src/groupchat.cpp index 1b76e3b09e..b3124c832c 100644 --- a/protocols/Gadu-Gadu/src/groupchat.cpp +++ b/protocols/Gadu-Gadu/src/groupchat.cpp @@ -54,7 +54,7 @@ int GaduProto::gc_init() void GaduProto::gc_menus_init(HGENMENU hRoot) { if (gc_enabled) { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.root = hRoot; diff --git a/protocols/Gadu-Gadu/src/image.cpp b/protocols/Gadu-Gadu/src/image.cpp index eb534d71b9..ad8e4ed499 100644 --- a/protocols/Gadu-Gadu/src/image.cpp +++ b/protocols/Gadu-Gadu/src/image.cpp @@ -69,7 +69,7 @@ int gg_img_remove(GGIMAGEDLGDATA *dat); int GaduProto::img_init() { // Send image contact menu item - CMenuItem mi; + CMenuItem mi(g_plugin); SET_UID(mi, 0xab238938, 0xed85, 0x4cfe, 0x93, 0xb5, 0xb8, 0x83, 0xf4, 0x32, 0xa0, 0xec); mi.position = -2000010000; mi.hIcolibItem = iconList[11].hIcolib; diff --git a/protocols/Gadu-Gadu/src/import.cpp b/protocols/Gadu-Gadu/src/import.cpp index 832afa9b98..86cb6d6678 100644 --- a/protocols/Gadu-Gadu/src/import.cpp +++ b/protocols/Gadu-Gadu/src/import.cpp @@ -535,7 +535,7 @@ INT_PTR GaduProto::export_server(WPARAM, LPARAM) // void GaduProto::import_init(HGENMENU hRoot) { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.root = hRoot; diff --git a/protocols/Gadu-Gadu/src/links.cpp b/protocols/Gadu-Gadu/src/links.cpp index c1f56f702c..8bd6d0c438 100644 --- a/protocols/Gadu-Gadu/src/links.cpp +++ b/protocols/Gadu-Gadu/src/links.cpp @@ -97,7 +97,7 @@ void gg_links_instancemenu_init() CreateServiceFunction(GGS_MENUCHOOSE, gg_menuchoose); hInstanceMenu = Menu_AddObject("GGAccountChooser", LPGEN("Gadu-Gadu account chooser"), nullptr, GGS_MENUCHOOSE); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.name.a = "Cancel"; mi.position = 9999999; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE); @@ -115,7 +115,7 @@ void gg_links_init() void GaduProto::links_instance_init() { if (ServiceExists(MS_ASSOCMGR_ADDNEWURLTYPE)) { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.position = CMPlugin::g_arInstances.getCount(); mi.name.w = m_tszUserName; diff --git a/protocols/Gadu-Gadu/src/sessions.cpp b/protocols/Gadu-Gadu/src/sessions.cpp index 10b4dc5c42..88718c94a1 100644 --- a/protocols/Gadu-Gadu/src/sessions.cpp +++ b/protocols/Gadu-Gadu/src/sessions.cpp @@ -418,7 +418,7 @@ BOOL GaduProto::sessions_closedlg() void GaduProto::sessions_menus_init(HGENMENU hRoot) { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.root = hRoot; diff --git a/protocols/IRCG/src/services.cpp b/protocols/IRCG/src/services.cpp index 9881e13ab1..c1dae9c492 100644 --- a/protocols/IRCG/src/services.cpp +++ b/protocols/IRCG/src/services.cpp @@ -23,7 +23,7 @@ Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA. void CIrcProto::OnBuildProtoMenu() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolRoot(this); mi.name.a = LPGEN("&Quick connect"); @@ -104,7 +104,7 @@ void InitContactMenus(void) char temp[MAXMODULELABELLENGTH]; char *d = temp + mir_snprintf(temp, "IRC"); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.pszService = temp; SET_UID(mi, 0x5f01196f, 0xfbcd, 0x4034, 0xbd, 0x90, 0x12, 0xa0, 0x20, 0x68, 0x15, 0xc0); diff --git a/protocols/IcqOscarJ/src/icq_menu.cpp b/protocols/IcqOscarJ/src/icq_menu.cpp index 827f3e9c09..284a41db5a 100644 --- a/protocols/IcqOscarJ/src/icq_menu.cpp +++ b/protocols/IcqOscarJ/src/icq_menu.cpp @@ -70,7 +70,7 @@ void g_MenuInit(void) char str[MAXMODULELABELLENGTH], *pszDest = str + 3; mir_strcpy(str, "ICQ"); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.pszService = str; // "Add to server list" diff --git a/protocols/IcqOscarJ/src/icq_xstatus.cpp b/protocols/IcqOscarJ/src/icq_xstatus.cpp index 06e986c238..bfbcc971d2 100644 --- a/protocols/IcqOscarJ/src/icq_xstatus.cpp +++ b/protocols/IcqOscarJ/src/icq_xstatus.cpp @@ -854,14 +854,14 @@ void CIcqProto::InitXStatusItems(BOOL bAllowStatus) wchar_t szItem[MAX_PATH + 64]; mir_snwprintf(szItem, TranslateT("%s Custom Status"), m_tszUserName); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolMenu(m_szModuleName); mi.name.w = szItem; mi.position = 10001; hRoot = Menu_AddStatusMenuItem(&mi, m_szModuleName); } - CMenuItem mi; + CMenuItem mi(g_plugin); mi.position = 2000040000; mi.root = hRoot; diff --git a/protocols/JabberG/src/jabber_menu.cpp b/protocols/JabberG/src/jabber_menu.cpp index 913f9330fa..3b8f9c0fac 100644 --- a/protocols/JabberG/src/jabber_menu.cpp +++ b/protocols/JabberG/src/jabber_menu.cpp @@ -152,7 +152,7 @@ void g_MenuInit(void) hChooserMenu = Menu_AddObject("JabberAccountChooser", LPGEN("Jabber account chooser"), nullptr, "Jabber/MenuChoose"); { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.name.a = "Cancel"; mi.position = 9999999; mi.hIcolibItem = Skin_GetIconHandle(SKINICON_OTHER_DELETE); @@ -162,7 +162,7 @@ void g_MenuInit(void) ////////////////////////////////////////////////////////////////////////////////////// // Contact menu initialization - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNMOVABLE; // "Convert Chat/Contact" @@ -370,7 +370,7 @@ int CJabberProto::OnPrebuildContactMenu(WPARAM hContact, LPARAM) } char text[256]; - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_SYSTEM; mi.pszService = text; @@ -530,7 +530,7 @@ INT_PTR __cdecl CJabberProto::OnMenuBookmarkAdd(WPARAM hContact, LPARAM) void CJabberProto::OnBuildProtoMenu() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = m_hMenuRoot = Menu_GetProtocolRoot(this); mi.flags = CMIF_UNMOVABLE; @@ -659,7 +659,7 @@ void CJabberProto::BuildPriorityMenu() if (m_hMenuPriorityRoot) Menu_RemoveItem(m_hMenuPriorityRoot); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.pszService = nullptr; mi.position = 200006; mi.root = m_hMenuRoot; @@ -729,7 +729,7 @@ void CJabberProto::GlobalMenuInit() ////////////////////////////////////////////////////////////////////////////////////// // Account chooser menu - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNMOVABLE | CMIF_UNICODE | CMIF_KEEPUNTRANSLATED; mi.position = iChooserMenuPos++; mi.name.w = m_tszUserName; diff --git a/protocols/JabberG/src/jabber_privacy.cpp b/protocols/JabberG/src/jabber_privacy.cpp index addd488905..f6645bf2e3 100644 --- a/protocols/JabberG/src/jabber_privacy.cpp +++ b/protocols/JabberG/src/jabber_privacy.cpp @@ -2090,7 +2090,7 @@ INT_PTR __cdecl CJabberProto::menuSetPrivacyList(WPARAM, LPARAM, LPARAM iList) void CJabberProto::BuildPrivacyMenu() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.position = 200005; mi.hIcolibItem = GetIconHandle(IDI_AGENTS); mi.flags = CMIF_UNMOVABLE | CMIF_HIDDEN; @@ -2120,7 +2120,7 @@ void CJabberProto::BuildPrivacyListsMenu(bool bDeleteOld) char srvFce[MAX_PATH + 64]; - CMenuItem mi; + CMenuItem mi(g_plugin); mi.position = 2000040000; mi.flags = CMIF_UNMOVABLE | CMIF_UNICODE; mi.root = m_hPrivacyMenuRoot; diff --git a/protocols/JabberG/src/jabber_xstatus.cpp b/protocols/JabberG/src/jabber_xstatus.cpp index 070af7048e..1825a3714d 100644 --- a/protocols/JabberG/src/jabber_xstatus.cpp +++ b/protocols/JabberG/src/jabber_xstatus.cpp @@ -468,7 +468,7 @@ void CPepGuiService::RebuildMenu() char szService[128]; mir_snprintf(szService, "/AdvStatusSet/%s", m_name); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = hJabberRoot; mi.pszService = szService; mi.position = 200010; diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index 572d64b0b8..f06dab8f5d 100644 --- a/protocols/MRA/src/Mra_menus.cpp +++ b/protocols/MRA/src/Mra_menus.cpp @@ -283,14 +283,14 @@ int CMraProto::MraRebuildStatusMenu(WPARAM, LPARAM) wchar_t szItem[MAX_PATH + 64]; mir_snwprintf(szItem, L"%s Custom Status", m_tszUserName); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolMenu(m_szModuleName); mi.name.w = szItem; mi.position = 10001; hRoot = Menu_AddStatusMenuItem(&mi, m_szModuleName); } - CMenuItem mi; + CMenuItem mi(g_plugin); mi.position = 2000060000; mi.root = hRoot; mi.flags = CMIF_UNICODE; @@ -331,7 +331,7 @@ HGENMENU CMraProto::CListCreateMenu(LONG lPosition, LONG lPopupPosition, BOOL bI char szServiceFunction[MAX_PATH]; - CMenuItem mi; + CMenuItem mi(g_plugin); HGENMENU hRootMenu, (__stdcall *fnAddFunc)(TMO_MenuItem*, const char*); if (bIsMain) { diff --git a/protocols/MSN/src/msn_menu.cpp b/protocols/MSN/src/msn_menu.cpp index 56d1b474af..3cf8a94b84 100644 --- a/protocols/MSN/src/msn_menu.cpp +++ b/protocols/MSN/src/msn_menu.cpp @@ -141,7 +141,7 @@ int CMsnProto::OnContactDoubleClicked(WPARAM hContact, LPARAM) // Menus initialization void CMsnProto::OnBuildProtoMenu(void) { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolRoot(this); mi.pszService = MSN_INVITE; @@ -225,7 +225,7 @@ void MSN_InitContactMenu(void) mir_strcpy(servicefunction, "MSN"); char* tDest = servicefunction + mir_strlen(servicefunction); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.pszService = servicefunction; SET_UID(mi, 0xc6169b8f, 0x53ab, 0x4242, 0xbe, 0x90, 0xe2, 0x4a, 0xa5, 0x73, 0x88, 0x32); diff --git a/protocols/Sametime/src/conference.cpp b/protocols/Sametime/src/conference.cpp index 1df4c0570f..9a5b6050a0 100644 --- a/protocols/Sametime/src/conference.cpp +++ b/protocols/Sametime/src/conference.cpp @@ -443,7 +443,7 @@ void CSametimeProto::InitConferenceMenu() CreateProtoService(MS_SAMETIME_MENULEAVECHAT, &CSametimeProto::onMenuLeaveChat); CreateProtoService(MS_SAMETIME_MENUCREATECHAT, &CSametimeProto::onMenuCreateChat); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE | CMIF_NOTOFFLINE; SET_UID(mi, 0x98cf8a8c, 0x75ba, 0x46f2, 0xa3, 0x35, 0x65, 0x46, 0x4a, 0x38, 0x20, 0x7d); diff --git a/protocols/Sametime/src/sametime_session.cpp b/protocols/Sametime/src/sametime_session.cpp index 5cdf633385..7e8913563f 100644 --- a/protocols/Sametime/src/sametime_session.cpp +++ b/protocols/Sametime/src/sametime_session.cpp @@ -571,7 +571,7 @@ void CSametimeProto::InitSessionMenu() CreateProtoService(MS_SAMETIME_MENUANNOUNCESESSION, &CSametimeProto::SessionAnnounce); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.position = 2000060000; mi.name.w = LPGENW("Send announcement..."); diff --git a/protocols/SkypeWeb/src/skype_menus.cpp b/protocols/SkypeWeb/src/skype_menus.cpp index 079d36e38b..7b16743df0 100644 --- a/protocols/SkypeWeb/src/skype_menus.cpp +++ b/protocols/SkypeWeb/src/skype_menus.cpp @@ -58,7 +58,7 @@ void CSkypeProto::InitMenus() //hChooserMenu = Menu_AddObject("SkypeAccountChooser", LPGEN("Skype menu chooser"), 0, "Skype/MenuChoose"); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.pszService = MODULE"/GetHistory"; @@ -88,7 +88,7 @@ void CSkypeProto::InitMenus() void CSkypeProto::OnBuildProtoMenu() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolRoot(this); mi.pszService = "/CreateNewChat"; diff --git a/protocols/Steam/src/steam_menus.cpp b/protocols/Steam/src/steam_menus.cpp index 40f84551d1..6689ef0acc 100644 --- a/protocols/Steam/src/steam_menus.cpp +++ b/protocols/Steam/src/steam_menus.cpp @@ -116,7 +116,7 @@ int CSteamProto::PrebuildContactMenu(WPARAM hContact, LPARAM lParam) void CSteamProto::OnInitStatusMenu() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.root = Menu_GetProtocolRoot(this); @@ -134,7 +134,7 @@ void CSteamProto::InitMenus() ////////////////////////////////////////////////////////////////////////////////////// // Contact menu initialization - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; // "Block" diff --git a/protocols/Tox/src/tox_menus.cpp b/protocols/Tox/src/tox_menus.cpp index e876cbeb6f..baebefe14a 100644 --- a/protocols/Tox/src/tox_menus.cpp +++ b/protocols/Tox/src/tox_menus.cpp @@ -46,7 +46,7 @@ int CToxProto::UpdateStatusMenu(WPARAM, LPARAM) void CToxProto::OnBuildProtoMenu() { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_UNICODE; mi.root = Menu_GetProtocolRoot(this); diff --git a/protocols/Twitter/src/proto.cpp b/protocols/Twitter/src/proto.cpp index 17a4deb100..92bf8cd33a 100644 --- a/protocols/Twitter/src/proto.cpp +++ b/protocols/Twitter/src/proto.cpp @@ -219,7 +219,7 @@ INT_PTR TwitterProto::VisitHomepage(WPARAM wParam, LPARAM) int TwitterProto::OnBuildStatusMenu(WPARAM, LPARAM) { - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolRoot(this); mi.flags = CMIF_UNICODE; mi.position = 1001; diff --git a/protocols/Twitter/src/theme.cpp b/protocols/Twitter/src/theme.cpp index e74d1872be..a9df14c7b3 100644 --- a/protocols/Twitter/src/theme.cpp +++ b/protocols/Twitter/src/theme.cpp @@ -75,7 +75,7 @@ void InitContactMenus() { HookEvent(ME_CLIST_PREBUILDCONTACTMENU, PrebuildContactMenu); - CMenuItem mi; + CMenuItem mi(g_plugin); mi.flags = CMIF_NOTOFFLINE | CMIF_UNICODE; SET_UID(mi, 0xfc4e1245, 0xc8e0, 0x4de2, 0x92, 0x15, 0xfc, 0xcf, 0x48, 0xf9, 0x41, 0x56); diff --git a/protocols/VKontakte/src/vk_proto.cpp b/protocols/VKontakte/src/vk_proto.cpp index 597825a617..135c4a9fa7 100644 --- a/protocols/VKontakte/src/vk_proto.cpp +++ b/protocols/VKontakte/src/vk_proto.cpp @@ -147,7 +147,7 @@ void CVkProto::InitMenus() for (int i = 0; i < PMI_COUNT; i++) m_hProtoMenuItems[i] = nullptr; - CMenuItem mi; + CMenuItem mi(g_plugin); mi.root = Menu_GetProtocolRoot(this); // Proto menu -- cgit v1.2.3