towards #2408: CSrmmBaseDialog::ProcessFileDrop - a helper with window handle to process file dropping operations

9 files changed, 14 insertions, 12 deletions

diff --git a/include/m_srmm_int.h b/include/m_srmm_int.h
index 8c95a761fa..5c0e75e27f 100644
--- a/include/m_srmm_int.h
+++ b/include/m_srmm_int.h
@@ -196,6 +196,7 @@ protected:
 	INT_PTR DlgProc(UINT msg, WPARAM wParam, LPARAM lParam) override;
 
 	int  NotifyEvent(int code);
+	bool ProcessFileDrop(HDROP hDrop, MCONTACT hContact);
 	bool ProcessHotkeys(int key, bool bShift, bool bCtrl, bool bAlt);
 	void RefreshButtonStatus(void);
 	void RunUserMenu(HWND hwndOwner, struct USERINFO *ui, const POINT &pt);
diff --git a/include/m_utils.h b/include/m_utils.h
index e6aecec3f8..d4cfd13593 100644
--- a/include/m_utils.h
+++ b/include/m_utils.h
@@ -51,15 +51,6 @@ EXTERN_C MIR_CORE_DLL(void) Utils_OpenUrl(const char *pszUrl, bool bOpenInNewWin
 EXTERN_C MIR_CORE_DLL(void) Utils_OpenUrlW(const wchar_t *pszUrl, bool bOpenInNewWindow = true);

 

 /////////////////////////////////////////////////////////////////////////////////////////

-// Converts a dropped file into a file transfer

-//

-// #include <shellapi.h> to use this function

-

-#ifdef _INC_SHELLAPI

-MIR_APP_DLL(bool) ProcessFileDrop(HDROP hDrop, MCONTACT hContact);

-#endif

-

-/////////////////////////////////////////////////////////////////////////////////////////

 // Resizes a dialog by calling a custom routine to move the individual

 // Returns 0 on success, or nonzero on failure

 // Does not support dialogtemplateex dialog boxes, and will return failure if you try to resize one

diff --git a/libs/win32/mir_app.lib b/libs/win32/mir_app.lib
index 9713eb8551..3bc2c38cd5 100644
--- a/libs/win32/mir_app.lib
+++ b/libs/win32/mir_app.lib
diff --git a/libs/win64/mir_app.lib b/libs/win64/mir_app.lib
index fb0c676fce..757ebf2095 100644
--- a/libs/win64/mir_app.lib
+++ b/libs/win64/mir_app.lib
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;