|
@@ -255,7 +255,6 @@ Type
|
|
private
|
|
private
|
|
FArchiveFileName: String;
|
|
FArchiveFileName: String;
|
|
FAttributes: LongInt;
|
|
FAttributes: LongInt;
|
|
- FCRC32: LongWord;
|
|
|
|
FDateTime: TDateTime;
|
|
FDateTime: TDateTime;
|
|
FDiskFileName: String;
|
|
FDiskFileName: String;
|
|
FHeaderPos: Longint;
|
|
FHeaderPos: Longint;
|
|
@@ -278,7 +277,6 @@ Type
|
|
Property DateTime : TDateTime Read FDateTime Write FDateTime;
|
|
Property DateTime : TDateTime Read FDateTime Write FDateTime;
|
|
property OS: Byte read FOS write FOS;
|
|
property OS: Byte read FOS write FOS;
|
|
property Attributes: LongInt read FAttributes write FAttributes;
|
|
property Attributes: LongInt read FAttributes write FAttributes;
|
|
- property CRC32: LongWord read FCRC32 write FCRC32;
|
|
|
|
end;
|
|
end;
|
|
|
|
|
|
{ TZipFileEntries }
|
|
{ TZipFileEntries }
|
|
@@ -354,9 +352,11 @@ Type
|
|
private
|
|
private
|
|
FCompressedSize: LongInt;
|
|
FCompressedSize: LongInt;
|
|
FCompressMethod: Word;
|
|
FCompressMethod: Word;
|
|
|
|
+ FCRC32: LongWord;
|
|
Public
|
|
Public
|
|
Property CompressMethod : Word Read FCompressMethod;
|
|
Property CompressMethod : Word Read FCompressMethod;
|
|
Property CompressedSize : LongInt Read FCompressedSize;
|
|
Property CompressedSize : LongInt Read FCompressedSize;
|
|
|
|
+ property CRC32: LongWord read FCRC32 write FCRC32;
|
|
end;
|
|
end;
|
|
|
|
|
|
{ TFullZipFileEntries }
|
|
{ TFullZipFileEntries }
|
|
@@ -394,9 +394,9 @@ Type
|
|
Procedure CloseOutput;
|
|
Procedure CloseOutput;
|
|
Procedure CloseInput;
|
|
Procedure CloseInput;
|
|
Procedure ReadZipDirectory;
|
|
Procedure ReadZipDirectory;
|
|
- Procedure ReadZipHeader(Item : TZipFileEntry; out AMethod : Word);
|
|
|
|
|
|
+ Procedure ReadZipHeader(Item : TFullZipFileEntry; out AMethod : Word);
|
|
Procedure DoEndOfFile;
|
|
Procedure DoEndOfFile;
|
|
- Procedure UnZipOneFile(Item : TZipFileEntry); virtual;
|
|
|
|
|
|
+ Procedure UnZipOneFile(Item : TFullZipFileEntry); virtual;
|
|
Function OpenOutput(OutFileName : String) : Boolean;
|
|
Function OpenOutput(OutFileName : String) : Boolean;
|
|
Procedure SetBufSize(Value : LongWord);
|
|
Procedure SetBufSize(Value : LongWord);
|
|
Procedure SetFileName(Value : String);
|
|
Procedure SetFileName(Value : String);
|
|
@@ -407,6 +407,7 @@ Type
|
|
Destructor Destroy;override;
|
|
Destructor Destroy;override;
|
|
Procedure UnZipAllFiles; virtual;
|
|
Procedure UnZipAllFiles; virtual;
|
|
Procedure UnZipFiles(AFileName : String; FileList : TStrings);
|
|
Procedure UnZipFiles(AFileName : String; FileList : TStrings);
|
|
|
|
+ Procedure UnZipFiles(FileList : TStrings);
|
|
Procedure UnZipAllFiles(AFileName : String);
|
|
Procedure UnZipAllFiles(AFileName : String);
|
|
Procedure Clear;
|
|
Procedure Clear;
|
|
Procedure Examine;
|
|
Procedure Examine;
|
|
@@ -1519,7 +1520,7 @@ Begin
|
|
end;
|
|
end;
|
|
|
|
|
|
|
|
|
|
-Procedure TUnZipper.ReadZipHeader(Item : TZipFileEntry; out AMethod : Word);
|
|
|
|
|
|
+Procedure TUnZipper.ReadZipHeader(Item : TFullZipFileEntry; out AMethod : Word);
|
|
Var
|
|
Var
|
|
S : String;
|
|
S : String;
|
|
D : TDateTime;
|
|
D : TDateTime;
|
|
@@ -1615,7 +1616,7 @@ begin
|
|
end;
|
|
end;
|
|
end;
|
|
end;
|
|
|
|
|
|
-Procedure TUnZipper.UnZipOneFile(Item : TZipFileEntry);
|
|
|
|
|
|
+Procedure TUnZipper.UnZipOneFile(Item : TFullZipFileEntry);
|
|
|
|
|
|
Var
|
|
Var
|
|
Count, Attrs: Longint;
|
|
Count, Attrs: Longint;
|
|
@@ -1722,7 +1723,7 @@ end;
|
|
|
|
|
|
Procedure TUnZipper.UnZipAllFiles;
|
|
Procedure TUnZipper.UnZipAllFiles;
|
|
Var
|
|
Var
|
|
- Item : TZipFileEntry;
|
|
|
|
|
|
+ Item : TFullZipFileEntry;
|
|
I : Integer;
|
|
I : Integer;
|
|
AllFiles : Boolean;
|
|
AllFiles : Boolean;
|
|
|
|
|
|
@@ -1775,8 +1776,13 @@ end;
|
|
Procedure TUnZipper.UnZipFiles(AFileName : String; FileList : TStrings);
|
|
Procedure TUnZipper.UnZipFiles(AFileName : String; FileList : TStrings);
|
|
|
|
|
|
begin
|
|
begin
|
|
- FFiles.Assign(FileList);
|
|
|
|
FFileName:=AFileName;
|
|
FFileName:=AFileName;
|
|
|
|
+ UNzipFiles(FileList);
|
|
|
|
+end;
|
|
|
|
+
|
|
|
|
+procedure TUnZipper.UnZipFiles(FileList: TStrings);
|
|
|
|
+begin
|
|
|
|
+ FFiles.Assign(FileList);
|
|
UnZipAllFiles;
|
|
UnZipAllFiles;
|
|
end;
|
|
end;
|
|
|
|
|