From f719c8b921c7a46b76453476204224d40c682914 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Wed, 11 Jul 2018 21:32:58 +0300 Subject: int hLangpack/m_hLang removed and replaced with HPLUGIN --- protocols/MRA/src/MraPopUp.cpp | 3 +-- protocols/MRA/src/Mra_menus.cpp | 6 +++--- protocols/MRA/src/Mra_options.cpp | 3 +-- 3 files changed, 5 insertions(+), 7 deletions(-) (limited to 'protocols/MRA/src') diff --git a/protocols/MRA/src/MraPopUp.cpp b/protocols/MRA/src/MraPopUp.cpp index b54fa0cc79..e6d20a55a0 100644 --- a/protocols/MRA/src/MraPopUp.cpp +++ b/protocols/MRA/src/MraPopUp.cpp @@ -127,10 +127,9 @@ INT_PTR CALLBACK MraPopupDlgProcOpts(HWND hWndDlg, UINT msg, WPARAM wParam, LPAR int CMraProto::OnPopupOptInit(WPARAM wParam, LPARAM) { if (ServiceExists(MS_POPUP_ADDPOPUPT)) { - OPTIONSDIALOGPAGE odp = { 0 }; + OPTIONSDIALOGPAGE odp = {}; odp.dwInitParam = (LPARAM)this; odp.position = 100000000; - odp.hInstance = g_plugin.getInst(); odp.pszTemplate = MAKEINTRESOURCEA(IDD_OPT_POPUPS); odp.szTitle.w = m_tszUserName; odp.szGroup.w = LPGENW("Popups"); diff --git a/protocols/MRA/src/Mra_menus.cpp b/protocols/MRA/src/Mra_menus.cpp index f06dab8f5d..4b72f0f850 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(g_plugin); + 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(g_plugin); + 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(g_plugin); + CMenuItem mi(&g_plugin); HGENMENU hRootMenu, (__stdcall *fnAddFunc)(TMO_MenuItem*, const char*); if (bIsMain) { diff --git a/protocols/MRA/src/Mra_options.cpp b/protocols/MRA/src/Mra_options.cpp index 2010c0846a..d1d36a3fef 100644 --- a/protocols/MRA/src/Mra_options.cpp +++ b/protocols/MRA/src/Mra_options.cpp @@ -213,9 +213,8 @@ INT_PTR CALLBACK DlgProcOptsConnections(HWND hWndDlg, UINT msg, WPARAM wParam, L int CMraProto::OnOptionsInit(WPARAM wParam, LPARAM lParam) { - OPTIONSDIALOGPAGE odp = { 0 }; + OPTIONSDIALOGPAGE odp = {}; odp.dwInitParam = (LPARAM)this; - odp.hInstance = g_plugin.getInst(); odp.szTitle.w = m_tszUserName; odp.szGroup.w = LPGENW("Network"); odp.flags = ODPF_BOLDGROUPS | ODPF_UNICODE; -- cgit v1.2.3