From 8e4d5ed217f3131238a7a02cfc89e1355bde1683 Mon Sep 17 00:00:00 2001 From: George Hazan Date: Fri, 29 May 2020 14:26:21 +0300 Subject: towards #2408: CSrmmBaseDialog::ProcessFileDrop - a helper with window handle to process file dropping operations --- src/mir_app/src/mir_app.def | 2 +- src/mir_app/src/mir_app64.def | 2 +- src/mir_app/src/miranda.h | 1 + src/mir_app/src/srmm_base.cpp | 9 +++++++++ src/mir_app/src/utils.cpp | 2 +- 5 files changed, 13 insertions(+), 3 deletions(-) (limited to 'src') diff --git a/src/mir_app/src/mir_app.def b/src/mir_app/src/mir_app.def index c753762538..c97af5c615 100644 --- a/src/mir_app/src/mir_app.def +++ b/src/mir_app/src/mir_app.def @@ -725,7 +725,7 @@ _WebSocket_Connect@12 @810 NONAME Netlib_Dump @812 NONAME ?ProtoBroadcastAsync@PROTO_INTERFACE@@QAEXIHHPAXJ@Z @813 NONAME ProtoBroadcastAsync @814 NONAME -?ProcessFileDrop@@YG_NPAUHDROP__@@I@Z @815 NONAME +?ProcessFileDrop@CSrmmBaseDialog@@IAE_NPAUHDROP__@@I@Z @815 NONAME ?ConfirmDelete@Clist@@3V?$CMOption@_N@@A @816 NONAME ?HideEmptyGroups@Clist@@3V?$CMOption@_N@@A @817 NONAME ?HideOffline@Clist@@3V?$CMOption@_N@@A @818 NONAME diff --git a/src/mir_app/src/mir_app64.def b/src/mir_app/src/mir_app64.def index 4d532688ff..2f2c292b58 100644 --- a/src/mir_app/src/mir_app64.def +++ b/src/mir_app/src/mir_app64.def @@ -725,7 +725,7 @@ WebSocket_Connect @810 NONAME Netlib_Dump @812 NONAME ?ProtoBroadcastAsync@PROTO_INTERFACE@@QEAAXIHHPEAX_J@Z @813 NONAME ProtoBroadcastAsync @814 NONAME -?ProcessFileDrop@@YA_NPEAUHDROP__@@I@Z @815 NONAME +?ProcessFileDrop@CSrmmBaseDialog@@IEAA_NPEAUHDROP__@@I@Z @815 NONAME ?ConfirmDelete@Clist@@3V?$CMOption@_N@@A @816 NONAME ?HideEmptyGroups@Clist@@3V?$CMOption@_N@@A @817 NONAME ?HideOffline@Clist@@3V?$CMOption@_N@@A @818 NONAME diff --git a/src/mir_app/src/miranda.h b/src/mir_app/src/miranda.h index c39f3c5552..5a4bd464af 100644 --- a/src/mir_app/src/miranda.h +++ b/src/mir_app/src/miranda.h @@ -195,6 +195,7 @@ INT_PTR stubChainRecv(WPARAM, LPARAM); /**** utils.cpp ************************************************************************/ +bool ProcessFileDrop(HDROP hDrop, MCONTACT hContact); void RegisterModule(CMPluginBase*); void HotkeyToName(wchar_t *buf, int size, BYTE shift, BYTE key); diff --git a/src/mir_app/src/srmm_base.cpp b/src/mir_app/src/srmm_base.cpp index 323a336b70..78e14711eb 100644 --- a/src/mir_app/src/srmm_base.cpp +++ b/src/mir_app/src/srmm_base.cpp @@ -733,6 +733,15 @@ int CSrmmBaseDialog::NotifyEvent(int code) return ::NotifyEventHooks(hHookSrmmEvent, 0, (LPARAM)&mwe); } +///////////////////////////////////////////////////////////////////////////////////////// + +bool CSrmmBaseDialog::ProcessFileDrop(HDROP hDrop, MCONTACT hContact) +{ + return ::ProcessFileDrop(hDrop, hContact); +} + +///////////////////////////////////////////////////////////////////////////////////////// + bool CSrmmBaseDialog::ProcessHotkeys(int key, bool isShift, bool isCtrl, bool isAlt) { // Esc (close tab) diff --git a/src/mir_app/src/utils.cpp b/src/mir_app/src/utils.cpp index 1f7c05bea9..ce1260ea37 100644 --- a/src/mir_app/src/utils.cpp +++ b/src/mir_app/src/utils.cpp @@ -341,7 +341,7 @@ static void AddToFileList(wchar_t **&pppFiles, int &totalCount, const wchar_t *s } } -MIR_APP_DLL(bool) ProcessFileDrop(HDROP hDrop, MCONTACT hContact) +bool ProcessFileDrop(HDROP hDrop, MCONTACT hContact) { if (hDrop == nullptr || hContact == 0) return false; -- cgit v1.2.3