From 33d16d137f4e468996592d3961a4cf8a2849cf55 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Mon, 9 Sep 2019 15:04:14 +0300 Subject: Srmm_FindDialog moved from StdMsg to the core --- src/core/stdmsg/src/msgs.cpp | 8 -------- src/mir_app/src/mir_app.def | 1 + src/mir_app/src/mir_app64.def | 1 + src/mir_app/src/srmm_util.cpp | 6 ++++++ 4 files changed, 8 insertions(+), 8 deletions(-) (limited to 'src') diff --git a/src/core/stdmsg/src/msgs.cpp b/src/core/stdmsg/src/msgs.cpp index 71b7b90e38..20f8982253 100644 --- a/src/core/stdmsg/src/msgs.cpp +++ b/src/core/stdmsg/src/msgs.cpp @@ -29,14 +29,6 @@ int OnCheckPlugins(WPARAM, LPARAM); ///////////////////////////////////////////////////////////////////////////////////////// -CMsgDialog* Srmm_FindDialog(MCONTACT hContact) -{ - HWND hwnd = Srmm_FindWindow(hContact); - return (hwnd) ? (CMsgDialog *)GetWindowLongPtr(hwnd, GWLP_USERDATA) : nullptr; -} - -///////////////////////////////////////////////////////////////////////////////////////// - int SendMessageDirect(const wchar_t *szMsg, MCONTACT hContact) { if (hContact == 0) diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index 5263809cc6..28af807c0e 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -330,6 +330,7 @@ ProtoGetAvatarMimeType @401 ?set_uin@DB_AUTH_BLOB@@QAEXK@Z @402 NONAME ??0CSrmmBaseDialog@@IAE@AAVCMPluginBase@@HPAUSESSION_INFO@@@Z @403 NONAME ??1CSrmmBaseDialog@@UAE@XZ @405 NONAME +Srmm_FindDialog @406 NONAME ??_7CSrmmBaseDialog@@6B@ @407 NONAME ?DlgProc@CSrmmBaseDialog@@MAEHIIJ@Z @408 NONAME ??2CSrmmBaseDialog@@SAPAXI@Z @409 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 46bbcdc13b..fd015ee41c 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -330,6 +330,7 @@ ProtoGetAvatarMimeType @401 ?set_uin@DB_AUTH_BLOB@@QEAAXK@Z @402 NONAME ??0CSrmmBaseDialog@@IEAA@AEAVCMPluginBase@@HPEAUSESSION_INFO@@@Z @403 NONAME ??1CSrmmBaseDialog@@UEAA@XZ @405 NONAME +Srmm_FindDialog @406 NONAME ??_7CSrmmBaseDialog@@6B@ @407 NONAME ?DlgProc@CSrmmBaseDialog@@MEAA_JI_K_J@Z @408 NONAME ??2CSrmmBaseDialog@@SAPEAX_K@Z @409 NONAME diff --git a/src/mir_app/src/srmm_util.cpp b/src/mir_app/src/srmm_util.cpp index 1fc59ec15c..519f2db35d 100644 --- a/src/mir_app/src/srmm_util.cpp +++ b/src/mir_app/src/srmm_util.cpp @@ -89,6 +89,12 @@ MIR_APP_DLL(HWND) Srmm_FindWindow(MCONTACT hContact) return WindowList_Find(g_hWindowList, hContact); } +MIR_APP_DLL(CMsgDialog*) Srmm_FindDialog(MCONTACT hContact) +{ + HWND hwnd = Srmm_FindWindow(hContact); + return (hwnd) ? (CMsgDialog *)GetWindowLongPtr(hwnd, GWLP_USERDATA) : nullptr; +} + ///////////////////////////////////////////////////////////////////////////////////////// // serializes all thread-unsafe operation to the first thread -- cgit v1.2.3