//\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
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
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
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
{
ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
}
+ NoRemove DragDropHandlers
+ {
+ ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+ }
}
}
{
ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
}
+ NoRemove DragDropHandlers
+ {
+ ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+ }
}
}
}
{
ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
}
+ NoRemove DragDropHandlers
+ {
+ ForceRemove WinMerge = s '{4E716236-AA30-4C65-B225-D68BBA81E9C2}'
+ }
}
}
}