Make drag'n'drop to programs like Total Commander and FileZilla work …

…if data is provided delayed. Prepared release of version 1.3.5.
TimoKunze · Apr 28, 2019 · 409625a · 409625a
1 parent 7f8bca0
commit 409625a
Show file tree

Hide file tree

Showing 12 changed files with 23 additions and 13 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 1.3.5 - 28/04/2019
+
+- FIX: Dragging data to certain programs like Total Commander or FileZilla did not work if the data was provided only in the OLESetData event.
+
+
+
 Version 1.3.4 - 04/02/2018
 
 - Upgraded to WTL 10.

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <p align=center>
-  <a href="https://github.com/TimoKunze/ToolBarControls/releases/tag/1.3.4">
-    <img alt="Release 1.3.4 Release" src="https://img.shields.io/badge/release-1.3.4-0688CB.svg">
+  <a href="https://github.com/TimoKunze/ToolBarControls/releases/tag/1.3.5">
+    <img alt="Release 1.3.5 Release" src="https://img.shields.io/badge/release-1.3.5-0688CB.svg">
   </a>
   <a href="https://github.com/TimoKunze/ToolBarControls/releases">
     <img alt="Download ToolBarControls" src="https://img.shields.io/badge/download-latest-0688CB.svg">

diff --git a/help/ANSI/Doxygen/private docs CHM.cfg b/help/ANSI/Doxygen/private docs CHM.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/help/ANSI/Doxygen/private docs.cfg b/help/ANSI/Doxygen/private docs.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/help/ANSI/Doxygen/public docs CHM.cfg b/help/ANSI/Doxygen/public docs CHM.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/help/ANSI/Doxygen/public docs.cfg b/help/ANSI/Doxygen/public docs.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/help/Unicode/Doxygen/private docs CHM.cfg b/help/Unicode/Doxygen/private docs CHM.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/help/Unicode/Doxygen/private docs.cfg b/help/Unicode/Doxygen/private docs.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/help/Unicode/Doxygen/public docs CHM.cfg b/help/Unicode/Doxygen/public docs CHM.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/help/Unicode/Doxygen/public docs.cfg b/help/Unicode/Doxygen/public docs.cfg
@@ -23,7 +23,7 @@ PROJECT_NAME           = "TimoSoft ToolBarControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.3.4.255
+PROJECT_NUMBER         = 1.3.5.258
 
 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) 
 # base path where the generated documentation will be put. 

diff --git a/src/SourceOLEDataObject.cpp b/src/SourceOLEDataObject.cpp
@@ -301,8 +301,12 @@ STDMETHODIMP SourceOLEDataObject::QueryGetData(FORMATETC* pFormat)
 
 	if(!pDataEntry->pData) {
 		if(secondChance) {
-			// format not supported
-			return DV_E_FORMATETC;
+			if(properties.pOwnerToolBar && properties.pOwnerToolBar->dragDropStatus.IsDragging()) {
+				return S_OK;
+			} else {
+				// format not supported
+				return DV_E_FORMATETC;
+			}
 		}
 
 		// raise the OLESetData event

diff --git a/src/res/resource.h b/src/res/resource.h
@@ -13,7 +13,7 @@
 #define VERSION_BUILD																258
 #define STRFILEVERSION															"1.3.5.258"
 #define STRPRODUCTVERSION														"1.3"
-#define STRTIMESTAMP																"2019/04/28 17:53:33"
+#define STRTIMESTAMP																"2019/04/28 17:55:40"
 
 #define IDB_REBAR																		1
 #define IDB_TOOLBAR																	2