Enable right button drag and drop

diff --git a/ShellExtension/ShellExtension.rc b/ShellExtension/ShellExtension.rc
index 935b817..9eb908a 100644 (file)
--- a/ShellExtension/ShellExtension.rc
+++ b/ShellExtension/ShellExtension.rc
@@ -304,8 +304,8 @@ END
 //\r
 \r
 VS_VERSION_INFO VERSIONINFO\r
- FILEVERSION 1,16,5,1\r
- PRODUCTVERSION 1,16,5,1\r
+ FILEVERSION 1,16,5,2\r
+ PRODUCTVERSION 1,16,5,2\r
  FILEFLAGSMASK 0x3fL\r
 #ifdef _DEBUG\r
  FILEFLAGS 0x1L\r
@@ -323,7 +323,7 @@ BEGIN
             VALUE "Comments", "\0"\r
             VALUE "CompanyName", "http://winmerge.org\0"\r
             VALUE "FileDescription", "WinMerge Shell Integration library\0"\r
-            VALUE "FileVersion", "1.16.5.1\0"\r
+            VALUE "FileVersion", "1.16.5.2\0"\r
             VALUE "InternalName", "ShellExtension\0"\r
             VALUE "LegalCopyright", "Copyright 2003-2013\0"\r
             VALUE "LegalTrademarks", "\0"\r
@@ -331,7 +331,7 @@ BEGIN
             VALUE "OriginalFilename", "ShellExtension.DLL\0"\r
             VALUE "PrivateBuild", "\0"\r
             VALUE "ProductName", "WinMerge Shell Integration library\0"\r
-            VALUE "ProductVersion", "1.16.5.1\0"\r
+            VALUE "ProductVersion", "1.16.5.2\0"\r
             VALUE "SpecialBuild", "\0"\r
         END\r
     END\r

diff --git a/ShellExtension/WinMergeShell.cpp b/ShellExtension/WinMergeShell.cpp
index 7038226..19a601f 100644 (file)
--- a/ShellExtension/WinMergeShell.cpp
+++ b/ShellExtension/WinMergeShell.cpp
@@ -279,15 +279,20 @@ HRESULT CWinMergeShell::Initialize(LPCITEMIDLIST pidlFolder,
                GlobalUnlock(stg.hGlobal);
                ReleaseStgMedium(&stg);
        }
-       else if (pidlFolder)
+       else
        {
+               m_nSelectedItems = 0;
+       }
+
                // No item selected - selection is the folder background
+       if (pidlFolder)
+       {
                TCHAR szPath[MAX_PATH] = {0};
 
                if (SHGetPathFromIDList(pidlFolder, szPath))
                {
-                       m_strPaths[0] = szPath;
-                       m_nSelectedItems = 1;
+                       if (m_nSelectedItems < MaxFileCount)
+                               m_strPaths[m_nSelectedItems++] = szPath;
                        hr = S_OK;
                }
                else

diff --git a/ShellExtension/WinMergeShell.rgs b/ShellExtension/WinMergeShell.rgs
index 51e1f84..9ae702b 100644 (file)
--- a/ShellExtension/WinMergeShell.rgs
+++ b/ShellExtension/WinMergeShell.rgs
@@ -42,6 +42,10 @@ HKCR
                        {
                                ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
                        }
+                       NoRemove DragDropHandlers
+                       {
+                               ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+                       }
                }
        }
 
@@ -55,6 +59,10 @@ HKCR
                                {
                                        ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
                                }
+                               NoRemove DragDropHandlers
+                               {
+                                       ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+                               }
                        }
                }
        }
@@ -67,6 +75,10 @@ HKCR
                        {
                                ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
                        }
+                       NoRemove DragDropHandlers
+                       {
+                               ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+                       }
                }
        }
 }