mirrors/doublecmd
2
0
Fork 0
mirror of https://github.com/doublecmd/doublecmd.git synced 2026-06-28 10:02:14 +00:00
Code Issues Projects Releases Packages Wiki Activity

FIX: Delete operation - unlock or elevate

Browse source
This commit is contained in:
Alexander Koblov 2019-10-12 09:40:33 +00:00
commit c07101ab5a
1 changed files with 23 additions and 3 deletions
Download patch file Download diff file Expand all files Collapse all files

26
src/filesources/filesystem/ufilesystemdeleteoperation.pas
View file

@ -61,7 +61,7 @@ implementation
uses
DCOSUtils, DCStrUtils, uLng, uFileSystemUtil, uTrash, uAdministrator
{$IF DEFINED(MSWINDOWS)}
, Windows, uFileUnlock, fFileUnlock
, Windows, uFileUnlock, fFileUnlock, uSuperUser
{$ENDIF}
;
@ -203,6 +203,10 @@ begin
end;
end;
{$IF DEFINED(MSWINDOWS)}
ElevateAction:= dupError;
{$ENDIF}
repeat
bRetry := False;
@ -332,8 +336,19 @@ begin
sQuestion+= LineEnding + mbSysErrorMessage(LastError);
end;
SetLength(PossibleResponses, Length(ResponsesError));
Move(ResponsesError[0], PossibleResponses[0], SizeOf(ResponsesError));
{$IF DEFINED(MSWINDOWS)}
if ElevationRequired(LastError) then
begin
SetLength(PossibleResponses, Length(ResponsesError) + 1);
Move(ResponsesError[0], PossibleResponses[0], SizeOf(ResponsesError));
PossibleResponses[High(PossibleResponses)]:= fsourRetryAdmin;
end
else
{$ENDIF}
begin
SetLength(PossibleResponses, Length(ResponsesError));
Move(ResponsesError[0], PossibleResponses[0], SizeOf(ResponsesError));
end;
{$IF DEFINED(MSWINDOWS)}
if (Length(ProcessInfo) > 0) or (LastError = ERROR_ACCESS_DENIED) or (LastError = ERROR_SHARING_VIOLATION) then
begin
@ -351,6 +366,11 @@ begin
fsourAbort:
RaiseAbortOperation;
{$IF DEFINED(MSWINDOWS)}
fsourRetryAdmin:
begin
bRetry:= True;
ElevateAction:= dupAccept;
end;
fsourUnlock:
begin
bRetry:= True;