Przeglądaj źródła

Revert "Update for merge." because of the revert merge.

Martijn Laan 3 miesięcy temu
rodzic
commit
993b183b11

+ 2 - 2
Projects/Src/Compression.SevenZipDllDecoder.pas

@@ -269,7 +269,7 @@ begin
           FCurrentFilename := ItemPath + '\';
           FCurrentFilename := ItemPath + '\';
           var ExpandedDir: String;
           var ExpandedDir: String;
           if not ValidateAndCombinePath(FExpandedDestDir, ItemPath, ExpandedDir) then Exit(E_ACCESSDENIED);
           if not ValidateAndCombinePath(FExpandedDestDir, ItemPath, ExpandedDir) then Exit(E_ACCESSDENIED);
-          ForceDirectoriesRedir(FDisableFsRedir, ExpandedDir);
+          ForceDirectories(FDisableFsRedir, ExpandedDir);
         end;
         end;
         outStream := nil;
         outStream := nil;
       end else begin
       end else begin
@@ -278,7 +278,7 @@ begin
         FCurrentFilename := ItemPath;
         FCurrentFilename := ItemPath;
         var ExpandedFileName: String;
         var ExpandedFileName: String;
         if not ValidateAndCombinePath(FExpandedDestDir, ItemPath, ExpandedFileName) then Exit(E_ACCESSDENIED);
         if not ValidateAndCombinePath(FExpandedDestDir, ItemPath, ExpandedFileName) then Exit(E_ACCESSDENIED);
-        ForceDirectoriesRedir(FDisableFsRedir, PathExtractPath(ExpandedFileName));
+        ForceDirectories(FDisableFsRedir, PathExtractPath(ExpandedFileName));
         { From IArchive.h: can also set outstream to nil to tell 7zip to skip the file }
         { From IArchive.h: can also set outstream to nil to tell 7zip to skip the file }
         outstream := TSequentialOutStream.Create(TFileRedir.Create(FDisableFsRedir, ExpandedFileName, fdCreateAlways, faWrite, fsNone));
         outstream := TSequentialOutStream.Create(TFileRedir.Create(FDisableFsRedir, ExpandedFileName, fdCreateAlways, faWrite, fsNone));
       end;
       end;