Bug 1575: Cannot enter subfolders of local drive mapped to WebDAV folder

https://winscp.net/tracker/1575

Source commit: 3d2b0a48d854f345528acaa2f9ee888e9f15ccbe

source/packages/filemng/BaseUtils.pas

@@ -36,7 +36,6 @@ type
   TFormatBytesStyle = (fbNone, fbKilobytes, fbShort);
 
 function CheckFileExists(FileName: string): Boolean;
-function DirExists(Dir: string): Boolean; overload;
 function ExtractFileNameOnly(Name: string): string;
 function FileOrDirExists(FileName: string): Boolean;
 function FormatBytes(Bytes: Int64; Style: TFormatBytesStyle = fbShort; UseUnitsForBytes: Boolean = True): string;
@@ -120,15 +119,8 @@ begin
 end; {StringCountains}
 
 function FileOrDirExists(FileName: string): Boolean;
-var
-  SRec : TSearchRec;
 begin
-  if Length(FileName) = 0 then Result := False
-    else
-  begin
-    Result := (FindFirst(ApiPath(FileName), faAnyFile, SRec) = 0);
-    SysUtils.FindCLose(SRec);
-  end;
+  Result := FileExists(FileName) or DirectoryExists(FileName);
 end; {FileOrDirExists}
 
 function CheckFileExists(FileName: string): Boolean;
@@ -149,21 +141,6 @@ begin
   end;
 end; {CheckFileExists}
 
-function DirExists(Dir: string): Boolean;
-var
-  SRec: TSearchRec;
-begin
-  Result := ((Length(Dir) <= 3) and (Length(Dir) >= 2)) and (Dir[2] = ':');
-  if not Result then
-  begin
-    if FindFirst(ApiPath(Dir), faAnyFile, SRec) = 0 then
-    begin
-      Result := (SRec.Attr and faDirectory <> 0);
-    end;
-    SysUtils.FindClose(SRec);
-  end;
-end; {DirExists}
-
 function ExtractFileNameOnly(Name: string): string;
 var
   Ext: string;

source/packages/filemng/DirView.pas

@@ -1192,7 +1192,7 @@ begin
       else FDriveType := DRIVE_UNKNOWN;
 
     FDirOK := (Length(FPath) > 0) and
-      DriveInfo[FPath[1]].DriveReady and DirExists(FPath);
+      DriveInfo[FPath[1]].DriveReady and DirectoryExists(FPath);
 
     if DirOK then
     begin
@@ -1312,7 +1312,7 @@ begin
     if IsRecycleBin then Reload(True)
       else
     begin
-      if not DirExists(Path) then
+      if not DirectoryExists(Path) then
       begin
         ClearItems;
         FDirOK := False;
@@ -1871,7 +1871,7 @@ begin
       NextItem := GetNextItem(Item, sdAll, [isSelected]);
       case PFileRec(Item.Data)^.IsDirectory of
         True:
-          if not DirExists(ItemFullFileName(Item)) then
+          if not DirectoryExists(ItemFullFileName(Item)) then
           begin
             DirDeleted := True;
             Item.Delete;
@@ -2714,7 +2714,7 @@ begin
     if PFileRec(Item.Data)^.IsDirectory then
     begin
       FileName := ItemFullFileName(Item);
-      if not DirExists(FileName) then
+      if not DirectoryExists(FileName) then
       begin
         Reload2;
         if Assigned(FDriveView) and Assigned(FDriveView.Selected) then
@@ -2726,7 +2726,7 @@ begin
       else
     FileName := ResolveFileShortCut(ItemFullFileName(Item), True);
 
-    if DirExists(FileName) then
+    if DirectoryExists(FileName) then
     begin
       Path := FileName;
       Exit;
@@ -2824,7 +2824,7 @@ var
   IsDirectory: Boolean;
 begin
   Item := GetItemFromHItem(HItem);
-  IsDirectory := DirExists(ItemFullFileName(Item));
+  IsDirectory := DirectoryExists(ItemFullFileName(Item));
   NewCaption := HItem.pszText;
 
   StopWatchThread;
@@ -3108,7 +3108,7 @@ var
 begin
   if DragDropFilesEx.FileList.Count > 0 then
   begin
-    if not DirExists(TargetPath) then
+    if not DirectoryExists(TargetPath) then
     begin
       Reload(True);
       DDError(DDPathNotFoundError);
@@ -3152,7 +3152,7 @@ begin
 
               if SourcePath = '' then
               begin
-                if DirExists(TFDDListItem(DragDropFilesEx.FileList[Index]^).Name) then
+                if DirectoryExists(TFDDListItem(DragDropFilesEx.FileList[Index]^).Name) then
                 begin
                   SourcePath := TFDDListItem(DragDropFilesEx.FileList[Index]^).Name;
                   SourceIsDirectory := True;

source/packages/filemng/DriveView.pas

@@ -797,7 +797,7 @@ end;
 
 function TDriveView.NodePathExists(Node: TTreeNode): Boolean;
 begin
-  Result := DirExists(NodePathName(Node));
+  Result := DirectoryExists(NodePathName(Node));
 end;
 
 function TDriveView.CanEdit(Node: TTreeNode): Boolean;
@@ -962,7 +962,7 @@ begin
   {Create the drive nodes:}
   RefreshRootNodes(dsDisplayName or dvdsFloppy);
   {Set the initial directory:}
-  if (Length(FDirectory) > 0) and DirExists(FDirectory) then
+  if (Length(FDirectory) > 0) and DirectoryExists(FDirectory) then
     Directory := FDirectory;
 
   FCreating := False;
@@ -1093,7 +1093,7 @@ begin
 
           if DriveReady then
           begin
-            if not DirExists(NewDir) then
+            if not DirectoryExists(NewDir) then
             begin
               ValidateDirectory(DriveStatus[Upcase(NewDir[1])].RootNode);
               Exit;
@@ -1686,7 +1686,7 @@ begin {CallBackValidateDir}
 
   {Check, if directory still exists: (but not with root directory) }
   if Assigned(Node.Parent) and (PScanDirInfo(Data)^.StartNode = Node) then
-    if not DirExists(NodePathName(Node)) then
+    if not DirectoryExists(NodePathName(Node)) then
     begin
       WorkNode := Node.Parent;
       if Selected = Node then
@@ -1935,13 +1935,13 @@ begin
       FileOperator.Flags := FileOperator.Flags + [foNoConfirmation];
 
     try
-      if DirExists(DelDir) then
+      if DirectoryExists(DelDir) then
       begin
         StopWatchThread;
         OperatorResult := FileOperator.Execute;
 
         if OperatorResult and (not FileOperator.OperationAborted) and
-           (not DirExists(DelDir)) then
+           (not DirectoryExists(DelDir)) then
         begin
           Node.Delete
         end

source/packages/my/ComboEdit.pas

@@ -408,14 +408,6 @@ begin
   if Result then Result := Pos('\', ExtractFileName(FileName)) = 0;
 end;
 
-function DirExists(Name: string): Boolean;
-var
-  Code: Integer;
-begin
-  Code := GetFileAttributes(PChar(ApiPath(Name)));
-  Result := (Code <> -1) and (FILE_ATTRIBUTE_DIRECTORY and Code <> 0);
-end;
-
 { TCustomComboEdit }
 
 constructor TCustomComboEdit.Create(AOwner: TComponent);
@@ -970,7 +962,7 @@ begin
   if not Action then Exit;
   if ValidFileName(Temp) then
     try
-      if DirExists(ExtractFilePath(Temp)) then
+      if DirectoryExists(ExtractFilePath(Temp)) then
         SetInitialDir(ExtractFilePath(Temp));
       if (ExtractFileName(Temp) = '') or
         not ValidFileName(ExtractFileName(Temp)) then Temp := '';
@@ -1140,7 +1132,7 @@ begin
     if (InitialDir <> '') then Temp := InitialDir
     else Temp := '\';
   end;
-  if not DirExists(Temp) then Temp := '\';
+  if not DirectoryExists(Temp) then Temp := '\';
   DisableSysErrors;
   try
     Action := SelectDirectory(FDialogText, '', Temp);
@@ -1153,7 +1145,7 @@ begin
     SelText := '';
     if (Text = '') or not MultipleDirs then Text := Temp
     else Text := Text + ';' + Temp;
-    if (Temp <> '') and DirExists(Temp) then InitialDir := Temp;
+    if (Temp <> '') and DirectoryExists(Temp) then InitialDir := Temp;
   end;
 end;