From 42fee4bf18089b08790194f64687158e344e56b1 Mon Sep 17 00:00:00 2001
From: George Hazan <george.hazan@gmail.com>
Date: Fri, 15 Mar 2024 18:47:45 +0300
Subject: WM_DROPFILES / WM_PASTE processing unification

---
 plugins/Scriver/src/input.cpp     |  2 +-
 plugins/Scriver/src/msgdialog.cpp | 21 ---------------------
 2 files changed, 1 insertion(+), 22 deletions(-)

(limited to 'plugins/Scriver/src')

diff --git a/plugins/Scriver/src/input.cpp b/plugins/Scriver/src/input.cpp
index bc6da8d3d9..e6e64db44d 100644
--- a/plugins/Scriver/src/input.cpp
+++ b/plugins/Scriver/src/input.cpp
@@ -49,7 +49,7 @@ void InputAreaContextMenu(HWND hwnd, WPARAM, LPARAM lParam, MCONTACT hContact)
 
 	if (!SendMessage(hwnd, EM_CANPASTE, 0, 0)) {
 		EnableMenuItem(hSubMenu, IDM_PASTESEND, MF_BYCOMMAND | MF_GRAYED);
-		if (!IsClipboardFormatAvailable(CF_HDROP))
+		if (!IsClipboardFormatAvailable(CF_HDROP) && !IsClipboardFormatAvailable(CF_BITMAP))
 			EnableMenuItem(hSubMenu, IDM_PASTE, MF_BYCOMMAND | MF_GRAYED);
 	}
 	if (lParam == 0xFFFFFFFF) {
diff --git a/plugins/Scriver/src/msgdialog.cpp b/plugins/Scriver/src/msgdialog.cpp
index 145e7500ee..55e47e594d 100644
--- a/plugins/Scriver/src/msgdialog.cpp
+++ b/plugins/Scriver/src/msgdialog.cpp
@@ -777,23 +777,6 @@ LRESULT CMsgDialog::WndProc_Message(UINT msg, WPARAM wParam, LPARAM lParam)
 		}
 		break;
 
-	case EM_PASTESPECIAL:
-	case WM_PASTE:
-		if (IsClipboardFormatAvailable(CF_HDROP)) {
-			if (OpenClipboard(m_message.GetHwnd())) {
-				HANDLE hDrop = GetClipboardData(CF_HDROP);
-				if (hDrop)
-					ProcessFileDrop((HDROP)hDrop, m_hContact);
-				CloseClipboard();
-			}
-			return 0;
-		}
-		break;
-
-	case WM_DROPFILES:
-		ProcessFileDrop((HDROP)wParam, m_hContact);
-		return 0;
-
 	case WM_CONTEXTMENU:
 		InputAreaContextMenu(m_message.GetHwnd(), wParam, lParam, m_hContact);
 		return TRUE;
@@ -859,10 +842,6 @@ INT_PTR CMsgDialog::DlgProc(UINT msg, WPARAM wParam, LPARAM lParam)
 			SendMessage(m_hwndParent, WM_SYSCOMMAND, SC_MINIMIZE, 0);
 		break;
 
-	case WM_DROPFILES:
-		ProcessFileDrop((HDROP)wParam, m_hContact);
-		break;
-
 	case DM_AVATARCHANGED:
 		ShowAvatar();
 		break;
-- 
cgit v1.2.3