mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-21 09:58:13 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Bug [0000312] "Remove junction in recycle bin"

Browse source
This commit is contained in:
Alexander Koblov 2012-01-18 20:02:08 +00:00
commit 96c2edcdc3
2 changed files with 18 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/newdesign/ufilesystemdeleteoperation.pas
View file

@ -245,7 +245,11 @@ begin
end;
if RemoveDirectly = fsoogYes then
begin
if aFile.IsDirectory then // directory
if aFile.IsLinkToDirectory then
begin
DeleteResult := mbRemoveDir(FileName);
end
else if aFile.IsDirectory then // directory
begin
DeleteSubDirectory(aFile);
// This directory has already been processed.

17
src/platform/utrash.pas
View file

@ -52,15 +52,24 @@ uses
function mbDeleteToTrash(const FileName: UTF8String): Boolean;
{$IF DEFINED(MSWINDOWS)}
var
wFileName: WideString;
wsFileName: WideString;
FileOp: TSHFileOpStructW;
dwFileAttributes: LongWord;
begin
wFileName:= UTF8Decode(FileName);
wFileName:= wFileName + #0;
wsFileName:= UTF8Decode(FileName);
// Windows before Vista don't move symlink into recycle bin
// correctly, so we return False in that case
if (Win32Platform = VER_PLATFORM_WIN32_NT) and (Win32MajorVersion < 6) then
begin
dwFileAttributes:= GetFileAttributesW(PWideChar(wsFileName));
if FPS_ISLNK(dwFileAttributes) and FPS_ISDIR(dwFileAttributes) then
Exit(False);
end;
wsFileName:= wsFileName + #0;
FillChar(FileOp, SizeOf(FileOp), 0);
FileOp.Wnd := TWin32Widgetset(Widgetset).AppHandle;
FileOp.wFunc := FO_DELETE;
FileOp.pFrom := PWideChar(wFileName);
FileOp.pFrom := PWideChar(wsFileName);
// Move without question
FileOp.fFlags := FOF_ALLOWUNDO or FOF_NOERRORUI or FOF_SILENT or FOF_NOCONFIRMATION;
Result := (SHFileOperationW(@FileOp) = 0) and (not FileOp.fAnyOperationsAborted);