소스 검색

Minor cleanup.

Martijn Laan 3 달 전
부모
커밋
b02e72299f
1개의 변경된 파일3개의 추가작업 그리고 4개의 파일을 삭제
  1. 3 4
      Projects/Src/Compression.SevenZipDLLDecoder.pas

+ 3 - 4
Projects/Src/Compression.SevenZipDLLDecoder.pas

@@ -99,7 +99,7 @@ type
       FOnExtractionProgress: TOnExtractionProgress;
       FOnExtractionProgress: TOnExtractionProgress;
       FProgressAndLogQueueLock: TObject;
       FProgressAndLogQueueLock: TObject;
       FProgress: TProgress;
       FProgress: TProgress;
-      FLogQueue: TStringList;
+      FLogQueue: TStrings;
       FResult: TResult;
       FResult: TResult;
     function GetProperty(const index: UInt32; const propID: PROPID;
     function GetProperty(const index: UInt32; const propID: PROPID;
       const allowedTypes: TVarTypeSet; out value: OleVariant): Boolean; overload;
       const allowedTypes: TVarTypeSet; out value: OleVariant): Boolean; overload;
@@ -273,9 +273,9 @@ end;
 
 
 destructor TArchiveExtractCallback.Destroy;
 destructor TArchiveExtractCallback.Destroy;
 begin
 begin
+  FResult.SavedFatalException.Free;
   FLogQueue.Free;
   FLogQueue.Free;
   FProgressAndLogQueueLock.Free;
   FProgressAndLogQueueLock.Free;
-  FResult.SavedFatalException.Free;
 end;
 end;
 
 
 function TArchiveExtractCallback.SetTotal(total: UInt64): HRESULT;
 function TArchiveExtractCallback.SetTotal(total: UInt64): HRESULT;
@@ -673,8 +673,7 @@ begin
     except
     except
       SevenZipWin32Error('CreateFile');
       SevenZipWin32Error('CreateFile');
     end;
     end;
-    const InStream: IInStream =
-      TInStream.Create(F);
+    const InStream: IInStream = TInStream.Create(F);
     var ScanSize: Int64 := 1 shl 23; { From Client7z.cpp }
     var ScanSize: Int64 := 1 shl 23; { From Client7z.cpp }
     const OpenCallback: IArchiveOpenCallback = TArchiveOpenCallback.Create(Password);
     const OpenCallback: IArchiveOpenCallback = TArchiveOpenCallback.Create(Password);
     if InArchive.Open(InStream, @ScanSize, OpenCallback) <> S_OK then
     if InArchive.Open(InStream, @ScanSize, OpenCallback) <> S_OK then