From 1007e462402626f15565ac10d9a7ac0ab30fa753 Mon Sep 17 00:00:00 2001
From: George Hazan <ghazan@miranda.im>
Date: Tue, 9 Jan 2018 18:36:00 +0300
Subject: fixes #1091 (corrupted heap after Paste)

---
 src/core/stdmsg/src/msgdialog.cpp | 42 +++++++++++++++++++++------------------
 src/core/stdmsg/src/msgs.h        |  1 +
 2 files changed, 24 insertions(+), 19 deletions(-)

diff --git a/src/core/stdmsg/src/msgdialog.cpp b/src/core/stdmsg/src/msgdialog.cpp
index 271e903f5f..bdbf4c6bbd 100644
--- a/src/core/stdmsg/src/msgdialog.cpp
+++ b/src/core/stdmsg/src/msgdialog.cpp
@@ -487,6 +487,26 @@ void CSrmmWindow::NotifyTyping(int mode)
 	CallService(MS_PROTO_SELFISTYPING, m_hContact, m_nTypeMode);
 }
 
+void CSrmmWindow::ProcessFileDrop(HDROP hDrop)
+{
+	if (m_szProto == nullptr) return;
+	if (!(CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_FILESEND)) return;
+	if (m_wStatus == ID_STATUS_OFFLINE) return;
+	if (m_hContact != 0) {
+		wchar_t szFilename[MAX_PATH];
+		int fileCount = DragQueryFile(hDrop, -1, nullptr, 0), totalCount = 0, i;
+		wchar_t **ppFiles = nullptr;
+		for (i = 0; i < fileCount; i++) {
+			DragQueryFile(hDrop, i, szFilename, _countof(szFilename));
+			AddToFileList(&ppFiles, &totalCount, szFilename);
+		}
+		CallServiceSync(MS_FILE_SENDSPECIFICFILEST, m_hContact, (LPARAM)ppFiles);
+		for (i = 0; ppFiles[i]; i++)
+			mir_free(ppFiles[i]);
+		mir_free(ppFiles);
+	}
+}
+
 void CSrmmWindow::ScrollToBottom()
 {
 	if (!(GetWindowLongPtr(m_log.GetHwnd(), GWL_STYLE) & WS_VSCROLL))
@@ -850,7 +870,7 @@ LRESULT CSrmmWindow::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 			if (OpenClipboard(m_message.GetHwnd())) {
 				HANDLE hDrop = GetClipboardData(CF_HDROP);
 				if (hDrop)
-					m_message.SendMsg(WM_DROPFILES, (WPARAM)hDrop, 0);
+					ProcessFileDrop((HDROP)hDrop);
 				CloseClipboard();
 			}
 		}
@@ -889,24 +909,8 @@ INT_PTR CSrmmWindow::DlgProc(UINT uMsg, WPARAM wParam, LPARAM lParam)
 		break;
 
 	case WM_DROPFILES: // Mod from tabsrmm
-		if (m_szProto == nullptr) break;
-		if (!(CallProtoService(m_szProto, PS_GETCAPS, PFLAGNUM_1, 0) & PF1_FILESEND)) break;
-		if (m_wStatus == ID_STATUS_OFFLINE) break;
-		if (m_hContact != 0) {
-			wchar_t szFilename[MAX_PATH];
-			HDROP hDrop = (HDROP)wParam;
-			int fileCount = DragQueryFile(hDrop, -1, nullptr, 0), totalCount = 0, i;
-			wchar_t **ppFiles = nullptr;
-			for (i = 0; i < fileCount; i++) {
-				DragQueryFile(hDrop, i, szFilename, _countof(szFilename));
-				AddToFileList(&ppFiles, &totalCount, szFilename);
-			}
-			CallServiceSync(MS_FILE_SENDSPECIFICFILEST, m_hContact, (LPARAM)ppFiles);
-			for (i = 0; ppFiles[i]; i++)
-				mir_free(ppFiles[i]);
-			mir_free(ppFiles);
-		}
-		break;
+		ProcessFileDrop((HDROP)wParam);
+		return TRUE;
 
 	case HM_AVATARACK:
 		ShowAvatar();
diff --git a/src/core/stdmsg/src/msgs.h b/src/core/stdmsg/src/msgs.h
index 23321866e6..56aa931f30 100644
--- a/src/core/stdmsg/src/msgs.h
+++ b/src/core/stdmsg/src/msgs.h
@@ -72,6 +72,7 @@ class CSrmmWindow : public CMsgDialog
 	CSplitter m_splitter;
 
 	void NotifyTyping(int mode);
+	void ProcessFileDrop(HDROP hDrop);
 	void ShowAvatar(void);
 	void ShowTime(void);
 	void SetupStatusBar(void);
-- 
cgit v1.2.3