Bladeren bron

Make Extract7ZipArchiveRedir's exception to like it was in 6.4.3, and therefore do same for ExtractArchiveRedir. These functions are purely for [Code] so should be ok like this.

Todo: look at ArchiveFind*, which is more integrated and should allow the caller to differentiate between ESevenZipError and other stuff.
Martijn Laan 3 maanden geleden
bovenliggende
commit
4c583c14b7
2 gewijzigde bestanden met toevoegingen van 4 en 4 verwijderingen
  1. 2 2
      Projects/Src/Compression.SevenZipDLLDecoder.pas
  2. 2 2
      Projects/Src/Compression.SevenZipDecoder.pas

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

@@ -979,9 +979,9 @@ begin
     Log('Everything is Ok'); { Just like 7zMain.c }
   except
     on E: EAbort do
-      raise ESevenZipError.Create(SetupMessages[msgErrorExtractionAborted])
+      raise Exception.Create(SetupMessages[msgErrorExtractionAborted])
     else
-      raise ESevenZipError.Create(FmtSetupMessage(msgErrorExtractionFailed, [GetExceptMessage]));
+      raise Exception.Create(FmtSetupMessage(msgErrorExtractionFailed, [GetExceptMessage]));
   end;
 end;
 

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

@@ -376,9 +376,9 @@ begin
       BadResultError(Res);
   except
     on E: EAbort do
-      raise ESevenZipError.Create(SetupMessages[msgErrorExtractionAborted])
+      raise Exception.Create(SetupMessages[msgErrorExtractionAborted])
     else
-      raise ESevenZipError.Create(FmtSetupMessage1(msgErrorExtractionFailed, GetExceptMessage));
+      raise Exception.Create(FmtSetupMessage1(msgErrorExtractionFailed, GetExceptMessage));
   end;
 end;