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

…if data is provided delayed. Prepared release of version 1.5.5.
TimoKunze · Apr 26, 2019 · 9dcad1f · 9dcad1f
1 parent 2448516
commit 9dcad1f
Show file tree

Hide file tree

Showing 16 changed files with 34 additions and 20 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,3 +1,9 @@
+Version 1.5.5 - 27/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.5.4 - 22/01/2018
 
 - Upgraded to WTL 10.

diff --git a/LICENSE b/LICENSE
@@ -1,6 +1,6 @@
 MIT License
 
-Copyright (c) 2009-2018 Timo Kunze
+Copyright (c) 2009-2019 Timo Kunze
 
 Permission is hereby granted, free of charge, to any person obtaining a copy
 of this software and associated documentation files (the "Software"), to deal

diff --git a/README.md b/README.md
@@ -1,6 +1,6 @@
 <p align=center>
-  <a href="https://github.com/TimoKunze/ComboListBoxControls/releases/tag/1.5.4">
-    <img alt="Release 1.5.4 Release" src="https://img.shields.io/badge/release-1.5.4-0688CB.svg">
+  <a href="https://github.com/TimoKunze/ComboListBoxControls/releases/tag/1.5.5">
+    <img alt="Release 1.5.5 Release" src="https://img.shields.io/badge/release-1.5.5-0688CB.svg">
   </a>
   <a href="https://github.com/TimoKunze/ComboListBoxControls/releases">
     <img alt="Download ComboListBoxControls" 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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 ComboListBoxControls"
 # This could be handy for archiving the generated documentation or 
 # if some version control system is used.
 
-PROJECT_NUMBER         = 1.5.4.199
+PROJECT_NUMBER         = 1.5.5.201
 
 # 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/CBLCtlsA.idl b/src/CBLCtlsA.idl
@@ -52,7 +52,7 @@
 /// <pre>
 ///      MIT License
 ///
-///      Copyright (c) 2009-2018 Timo Kunze
+///      Copyright (c) 2009-2019 Timo Kunze
 ///
 ///      Permission is hereby granted, free of charge, to any person obtaining a copy
 ///      of this software and associated documentation files (the "Software"), to deal

diff --git a/src/CBLCtlsU.idl b/src/CBLCtlsU.idl
@@ -54,7 +54,7 @@
 /// <pre>
 ///      MIT License
 ///
-///      Copyright (c) 2009-2018 Timo Kunze
+///      Copyright (c) 2009-2019 Timo Kunze
 ///
 ///      Permission is hereby granted, free of charge, to any person obtaining a copy
 ///      of this software and associated documentation files (the "Software"), to deal

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

diff --git a/src/res/CBLCtls.rc b/src/res/CBLCtls.rc
@@ -82,7 +82,7 @@ BEGIN
 #else
             VALUE "InternalName", "CBLCtlsA.ocx"
 #endif
-            VALUE "LegalCopyright", "Copyright (C) 2009-2018 Timo ""TimoSoft"" Kunze"
+            VALUE "LegalCopyright", "Copyright (C) 2009-2019 Timo ""TimoSoft"" Kunze"
 #ifdef _UNICODE
             VALUE "OriginalFilename", "CBLCtlsU.ocx"
 #else

diff --git a/src/res/resource.h b/src/res/resource.h
@@ -8,12 +8,12 @@
 
 #define VERSION_MAJOR																1
 #define VERSION_MINOR																5
-#define VERSION_REVISION1														4
+#define VERSION_REVISION1														5
 #define VERSION_REVISION2														0
-#define VERSION_BUILD																199
-#define STRFILEVERSION															"1.5.4.199"
+#define VERSION_BUILD																201
+#define STRFILEVERSION															"1.5.5.201"
 #define STRPRODUCTVERSION														"1.5"
-#define STRTIMESTAMP																"2018/01/22 01:13:27"
+#define STRTIMESTAMP																"2019/04/27 00:04:42"
 
 #define IDB_COMBOBOX																1
 #define IDB_DRIVECOMBOBOX														2