From 13c65091dba7803ddc8b604732d3cf3e8cb2fe5d Mon Sep 17 00:00:00 2001 From: George Hazan Date: Sat, 11 Feb 2023 18:58:29 +0300 Subject: PS_CREATEACCMGRUI is obsoleted and converted into event --- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + src/mir_app/src/proto_interface.cpp | 5 +++++ src/mir_app/src/proto_opts.cpp | 7 +++---- 4 files changed, 10 insertions(+), 4 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 208d93904c..bca07ef01d 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -819,3 +819,4 @@ Srmm_CreateHotkey @886 NONAME ?Chat_Control@@YGHPBDH@Z @934 NONAME ?UpdateChatLog@CSrmmBaseDialog@@IAEXXZ @935 NONAME ?OnMarkRead@PROTO_INTERFACE@@UAEXII@Z @936 NONAME +?OnCreateAccMgrUI@PROTO_INTERFACE@@UAEPAUHWND__@@PAU2@@Z @937 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 451d75680a..b1ec756b7f 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -819,3 +819,4 @@ Srmm_CreateHotkey @886 NONAME ?Chat_Control@@YAHPEBDH@Z @934 NONAME ?UpdateChatLog@CSrmmBaseDialog@@IEAAXXZ @935 NONAME ?OnMarkRead@PROTO_INTERFACE@@UEAAXII@Z @936 NONAME +?OnCreateAccMgrUI@PROTO_INTERFACE@@UEAAPEAUHWND__@@PEAU2@@Z @937 NONAME diff --git a/src/mir_app/src/proto_interface.cpp b/src/mir_app/src/proto_interface.cpp index 96c155a9a9..16718039f7 100644 --- a/src/mir_app/src/proto_interface.cpp +++ b/src/mir_app/src/proto_interface.cpp @@ -74,6 +74,11 @@ void PROTO_INTERFACE::OnContactAdded(MCONTACT) void PROTO_INTERFACE::OnContactDeleted(MCONTACT) {} +MWindow PROTO_INTERFACE::OnCreateAccMgrUI(MWindow) +{ + return nullptr; // error +} + void PROTO_INTERFACE::OnEventEdited(MCONTACT, MEVENT) {} diff --git a/src/mir_app/src/proto_opts.cpp b/src/mir_app/src/proto_opts.cpp index c2dfe73e72..68e2d71658 100644 --- a/src/mir_app/src/proto_opts.cpp +++ b/src/mir_app/src/proto_opts.cpp @@ -202,12 +202,11 @@ class CAccountManagerDlg : public CDlgBase SetDlgItemText(m_hwnd, IDC_TXT_INFO, TranslateT("Account is disabled. Please activate it to access options.")); } else { - HWND hwnd = (HWND)CallProtoService(pa->szModuleName, PS_CREATEACCMGRUI, 0, (LPARAM)m_hwnd); - if (hwnd && (hwnd != (HWND)CALLSERVICE_NOTFOUND)) { - RECT rc; - + MWindow hwnd = pa->ppro->OnCreateAccMgrUI(m_hwnd); + if (hwnd) { ShowWindow(GetDlgItem(m_hwnd, IDC_TXT_INFO), SW_HIDE); + RECT rc; GetWindowRect(GetDlgItem(m_hwnd, IDC_TXT_INFO), &rc); MapWindowPoints(nullptr, m_hwnd, (LPPOINT)&rc, 2); SetWindowPos(hwnd, m_accList.GetHwnd(), rc.left, rc.top, 0, 0, SWP_NOSIZE | SWP_SHOWWINDOW); -- cgit v1.2.3