index f9e54ad57f88f597a6a56fdf8e0fac7b8b1f4136..42816ab40d1b099922b82f2c8f4e2b01003ae256 100644 (file)
// - Encryption not supported
// - Zero-length file names not supported
// - CDR holds most actual data about file, LFH mostly ignored
-// - Attributes, comments and extra data are ignored and not saved
+// - Attributes and extra data are ignored and not preserved
// - Store and Deflate compression supported
interface
usize: UInt32;
comp: UInt32;
chksum: UInt32;
+ mtime: UInt32;
+ flags: UInt32;
+ comment: AnsiString;
stream: TMemoryStream;
end;
TSection = record
name: AnsiString;
+ mtime: UInt32;
+ comment: AnsiString;
list: array of TResource;
end;
private
FSection: array of TSection;
FStream: TStream;
+ FComment: AnsiString;
FLastError: Integer;
FVersion: Byte;
function FindSectionIDRAW(name: AnsiString; caseSensitive: Boolean): Integer;
function FindSectionRAW(name: AnsiString; caseSensitive: Boolean): PSection;
- function InsertSectionRAW(name: AnsiString): PSection;
+ function InsertSectionRAW(name: AnsiString; mtime: UInt32; comment: AnsiString): PSection;
function FindSectionID(name: AnsiString): Integer;
function FindSection(name: AnsiString): PSection;
- function InsertSection(name: AnsiString): PSection;
+ function InsertSection(name: AnsiString; mtime: UInt32; comment: AnsiString): PSection;
- function InsertFileInfo(const section, name: AnsiString; pos, csize, usize, comp, crc: UInt32): PResource;
+ function InsertFileInfo(const section, name: AnsiString; pos, csize, usize, comp, crc, mtime, flags: UInt32; comment: AnsiString): PResource;
function Preload(p: PResource): Boolean;
function GetSourceStream(p: PResource): TStream;
- procedure ReadLFH(s: TStream; fname: AnsiString; xcsize, xusize, xcomp, xcrc: UInt32);
+ procedure Clear();
+
+ procedure ReadLFH(s: TStream; fname, xcomment: AnsiString; xcsize, xusize, xcomp, xcrc, xtime, xflags: UInt32);
procedure ReadCDR(s: TStream; cdrid: Integer);
function FindEOCD(s: TStream): Boolean;
procedure ReadEOCD(s: TStream);
- procedure WriteLFH(s: TStream; comp, crc, csize, usize: UInt32; const afname: AnsiString);
- procedure WriteCDR(s: TStream; comp, crc, csize, usize, eattr, offset: UInt32; const afname: AnsiString; cdrid: Integer);
+ procedure WriteLFH(s: TStream; flags, comp, mtime, crc, csize, usize: UInt32; const name: AnsiString);
+ procedure WriteCDR(s: TStream; flags, comp, mtime, crc, csize, usize, eattr, offset: UInt32; const name, com: AnsiString; cdrid: Integer);
procedure SaveToStream(s: TStream);
public
implementation
- uses SysUtils, StrUtils, Math, utils, zstream, crc, e_log;
+ uses SysUtils, StrUtils, DateUtils, Math, utils, zstream, crc, e_log;
const
ZIP_SIGN_CDR = 'PK'#1#2;
const
ZIP_ENCRYPTION_MASK = (1 << 0) or (1 << 6) or (1 << 13);
+ ZIP_COMP_MASK = (1 << 1) or (1 << 2) or (1 << 4) or (1 << 12);
+ ZIP_DATA_MASK = (1 << 3);
+ ZIP_PATCH_MASK = (1 << 5);
ZIP_UTF8_MASK = (1 << 11);
+ ZIP_STREAM_MASK = (1 << 14);
function IsASCII(const s: AnsiString): Boolean;
var i: Integer;
Result := True;
end;
+ function DosToStr(dostime: UInt32): AnsiString;
+ begin
+ try
+ DateTimeToString(Result, 'yyyy/mm/dd hh:nn:ss', DosDateTimeToDateTime(dostime));
+ except on e: EConvertError do
+ Result := 'INVALID ($' + IntToHex(dostime, 8) + ')';
+ end;
+ end;
+
procedure ToSectionFile(fname: AnsiString; out section, name: AnsiString); inline;
var i: SizeInt;
begin
Result := nil;
end;
- function TZIPEditor.InsertSectionRAW(name: AnsiString): PSection;
+ function TZIPEditor.InsertSectionRAW(name: AnsiString; mtime: UInt32; comment: AnsiString): PSection;
var i: Integer;
begin
if FSection = nil then i := 0 else i := Length(FSection);
SetLength(FSection, i + 1);
FSection[i] := Default(TSection);
FSection[i].name := name;
+ FSection[i].mtime := mtime;
+ FSection[i].comment := comment;
Result := @FSection[i];
end;
Result := FindSectionRAW(fixName, False); // CASENAME
end;
- function TZIPEditor.InsertSection(name: AnsiString): PSection;
+ function TZIPEditor.InsertSection(name: AnsiString; mtime: UInt32; comment: AnsiString): PSection;
begin
Result := FindSection(name);
if Result = nil then
- Result := InsertSectionRAW(name);
+ Result := InsertSectionRAW(name, mtime, comment);
end;
- function TZIPEditor.InsertFileInfo(const section, name: AnsiString; pos, csize, usize, comp, crc: UInt32): PResource;
+ function TZIPEditor.InsertFileInfo(const section, name: AnsiString; pos, csize, usize, comp, crc, mtime, flags: UInt32; comment: AnsiString): PResource;
var p: PSection; i: Integer;
begin
p := FindSectionRAW(section, True);
if p = nil then
- p := InsertSectionRAW(section);
+ p := InsertSectionRAW(section, mtime, '');
if p.list = nil then i := 0 else i := Length(p.list);
SetLength(p.list, i + 1);
p.list[i] := Default(TResource);
p.list[i].usize := usize;
p.list[i].comp := comp;
p.list[i].chksum := crc;
+ p.list[i].mtime := mtime;
+ p.list[i].flags := flags;
+ p.list[i].comment := comment;
p.list[i].stream := nil;
Result := @p.list[i];
end;
var s: TMemoryStream; cs: TCompressionStream; p: PResource;
var comp, crc: UInt32;
begin
+ Name := win2utf(Name);
+ Section := win2utf(Section);
Result := False;
if Name <> '' then
begin
end;
crc := crc32(0, nil, 0);
crc := crc32(crc, data, len);
- p := InsertFileInfo(Section, Name, $ffffffff, s.Size, Len, comp, crc);
+ p := InsertFileInfo(Section, Name, $ffffffff, s.Size, Len, comp, crc, DateTimeToDosDateTime(Now()), 0, '');
p.stream := s;
Result := True;
except
begin
FSection := nil;
FStream := nil;
+ FComment := '';
FLastError := DFWAD_NOERROR;
FVersion := 10;
- FreeWAD();
end;
destructor TZIPEditor.Destroy();
begin
- FreeWAD();
+ Clear();
inherited;
end;
- procedure TZIPEditor.FreeWAD();
+ procedure TZIPEditor.Clear();
var i, j: Integer;
begin
if FSection <> nil then
begin
FreeAndNil(FStream);
end;
+ FComment := '';
+ end;
+
+ procedure TZIPEditor.FreeWAD();
+ begin
+ Clear();
FLastError := DFWAD_NOERROR;
FVersion := 10;
end;
procedure TZIPEditor.AddSection(Name: String);
begin
- if InsertSection(Name) = nil then
+ Name := win2utf(Name);
+ if InsertSection(Name, DateTimeToDosDateTime(Now()), '') = nil then
raise Exception.Create('DFZIP: AddSection[' + Name + ']: failed to insert');
end;
function TZIPEditor.HaveResource(Section, Resource: String): Boolean;
begin
+ Section := win2utf(Section);
+ Resource := win2utf(Resource);
Result := FindResource(FindSection(Section), Resource) <> nil;
end;
function TZIPEditor.HaveSection(Section: String): Boolean;
begin
+ Section := win2utf(Section);
Result := FindSection(Section) <> nil;
end;
function TZIPEditor.GetResource(Section, Resource: String; var pData: Pointer; var Len: Integer): Boolean;
var p: PResource; ptr: PByte; src: TStream; tmp: TDecompressionStream; crc: UInt32;
begin
+ Section := win2utf(Section);
+ Resource := win2utf(Resource);
FLastError := DFWAD_ERROR_CANTOPENWAD;
Result := False;
pData := nil;
function TZIPEditor.GetResourcesList(Section: String): SArray;
var p: PSection; i: Integer;
begin
+ Section := win2utf(Section);
Result := nil;
p := FindSection(Section);
if (p <> nil) and (p.list <> nil) then
SetLength(Result, Length(p.list));
for i := 0 to High(p.list) do
begin
- Result[i] := p.list[i].name;
+ Result[i] := utf2win(p.list[i].name);
end;
end;
end;
SetLength(Result, Length(FSection));
for i := 0 to High(FSection) do
begin
- Result[i] := FSection[i].name;
+ Result[i] := utf2win(FSection[i].name);
end;
end;
end;
- procedure TZIPEditor.ReadLFH(s: TStream; fname: AnsiString; xcsize, xusize, xcomp, xcrc: UInt32);
+ procedure TZIPEditor.ReadLFH(s: TStream; fname, xcomment: AnsiString; xcsize, xusize, xcomp, xcrc, xtime, xflags: UInt32);
var sig: packed array [0..3] of Char;
var va, vb, flags, comp: UInt16;
var mtime, crc, csize, usize: UInt32;
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Min System : ' + IntToStr(vb), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Flags : $' + IntToHex(flags, 4), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Compression : ' + IntToStr(comp), MSG_NOTIFY);
- e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Modification Time : $' + IntToHex(mtime, 8), MSG_NOTIFY);
+ e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Modification Time : ' + DosToStr(mtime), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': CRC-32 : $' + IntToHex(crc, 8), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Compressed size : ' + IntToStr(csize), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Decompressed size : ' + IntToStr(usize), MSG_NOTIFY);
begin
p := FindSectionRAW(section, True);
if p = nil then
- p := InsertSectionRAW(section)
+ p := InsertSectionRAW(section, xtime, xcomment);
end
else
begin
- p := InsertFileInfo(section, name, datapos, xcsize, xusize, xcomp, xcrc);
+ p := InsertFileInfo(section, name, datapos, xcsize, xusize, xcomp, xcrc, xtime, xflags and ZIP_COMP_MASK, xcomment);
end;
if p = nil then
raise Exception.Create('Failed to register resource [' + fname + ']');
var fnlen, extlen, comlen, disk, iattr: UInt16;
var eattr, offset: UInt32;
var mypos, next: UInt64;
- var name: PChar;
- var aname: AnsiString;
+ var tmp: PChar;
+ var name, comment: AnsiString;
var cvtbug, utf8: Boolean;
begin
mypos := s.Position;
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Min System : ' + IntToStr(vb), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Flags : $' + IntToHex(flags, 4), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Compression : ' + IntToStr(comp), MSG_NOTIFY);
- e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Modification Time : $' + IntToHex(mtime, 8), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Modification Time : ' + DosToStr(mtime), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': CRC-32 : $' + IntToHex(crc, 8), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Compressed size : ' + IntToStr(csize), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Decompressed size : ' + IntToStr(usize), MSG_NOTIFY);
begin
if (flags and ZIP_ENCRYPTION_MASK) = 0 then
begin
- if (csize <> $ffffffff) and (usize <> $ffffffff) and (disk <> $ffff) and (offset <> $ffffffff) then
+ if (flags and ZIP_PATCH_MASK) = 0 then
begin
- if disk = 0 then
+ if (csize <> $ffffffff) and (usize <> $ffffffff) and (disk <> $ffff) and (offset <> $ffffffff) then
begin
- if (next <= s.Size) and (fnlen > 0) then
+ if disk = 0 then
begin
- case comp of
- ZIP_COMP_STORE:
- if csize <> usize then
- raise Exception.Create('Compressed size ' + IntToStr(csize) + ' != Descompressed size ' + IntToStr(usize) + 'for STORE method (corrupted file?)');
- ZIP_COMP_SHRUNK,
- ZIP_COMP_REDUCE1,
- ZIP_COMP_REDUCE2,
- ZIP_COMP_REDUCE3,
- ZIP_COMP_REDUCE4,
- ZIP_COMP_IMPLODE,
- ZIP_COMP_DEFLATE,
- ZIP_COMP_DEFLATE64,
- ZIP_COMP_TERSE1,
- ZIP_COMP_BZIP2,
- ZIP_COMP_LZMA,
- ZIP_COMP_CMPSC,
- ZIP_COMP_TERSE2,
- ZIP_COMP_LZ77,
- ZIP_COMP_ZSTD1,
- ZIP_COMP_ZSTD2,
- ZIP_COMP_MP3,
- ZIP_COMP_XZ,
- ZIP_COMP_JPEG,
- ZIP_COMP_WAVPACK,
- ZIP_COMP_PPMD:
- ; // ok
- ZIP_COMP_AE:
- raise Exception.Create('Encrypted archives not supported');
- otherwise
- raise Exception.Create('Unknown compression method ' + IntToStr(comp));
- end;
- GetMem(name, UInt32(fnlen) + 1);
- try
- s.ReadBuffer(name[0], fnlen);
- name[fnlen] := #0;
- aname := name;
+ if (next <= s.Size) and (fnlen > 0) then
+ begin
+ case comp of
+ ZIP_COMP_STORE:
+ if csize <> usize then
+ raise Exception.Create('Compressed size ' + IntToStr(csize) + ' != Descompressed size ' + IntToStr(usize) + 'for STORE method (corrupted file?)');
+ ZIP_COMP_SHRUNK,
+ ZIP_COMP_REDUCE1,
+ ZIP_COMP_REDUCE2,
+ ZIP_COMP_REDUCE3,
+ ZIP_COMP_REDUCE4,
+ ZIP_COMP_IMPLODE,
+ ZIP_COMP_DEFLATE,
+ ZIP_COMP_DEFLATE64,
+ ZIP_COMP_TERSE1,
+ ZIP_COMP_BZIP2,
+ ZIP_COMP_LZMA,
+ ZIP_COMP_CMPSC,
+ ZIP_COMP_TERSE2,
+ ZIP_COMP_LZ77,
+ ZIP_COMP_ZSTD1,
+ ZIP_COMP_ZSTD2,
+ ZIP_COMP_MP3,
+ ZIP_COMP_XZ,
+ ZIP_COMP_JPEG,
+ ZIP_COMP_WAVPACK,
+ ZIP_COMP_PPMD:
+ ; // ok
+ ZIP_COMP_AE:
+ raise Exception.Create('Encrypted archives not supported');
+ otherwise
+ raise Exception.Create('Unknown compression method ' + IntToStr(comp));
+ end;
+
+ // Read Name
+ GetMem(tmp, UInt32(fnlen) + 1);
+ try
+ s.ReadBuffer(tmp[0], fnlen);
+ tmp[fnlen] := #0;
+ name := tmp;
+ finally
+ FreeMem(tmp);
+ end;
+ // Skip ZIP extensions
+ s.Seek(extlen, TSeekOrigin.soCurrent);
+ // Read Comment
+ comment := '';
+ if comlen > 0 then
+ begin
+ GetMem(tmp, UInt32(comlen) + 1);
+ try
+ s.ReadBuffer(tmp[0], comlen);
+ tmp[comlen] := #0;
+ comment := tmp;
+ finally
+ FreeMem(tmp);
+ end;
+ end;
+
utf8 := True;
- if (flags and ZIP_UTF8_MASK = 0) and (IsUTF8(name) = False) then
+ if (utf8 = False) or (flags and ZIP_UTF8_MASK = 0) and (IsUTF8(name) = False) then
begin
- aname := win2utf(aname);
+ name := win2utf(name);
+ utf8 := False;
+ end;
+ if (utf8 = False) or (flags and ZIP_UTF8_MASK = 0) and (IsUTF8(comment) = False) then
+ begin
+ comment := win2utf(comment);
utf8 := False;
end;
if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
begin
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': UTF-8 Comatible : ' + BoolToStr(utf8, True), MSG_NOTIFY);
- e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Name : "' + aname + '"', MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Name : "' + name + '"', MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Comment : "' + comment + '"', MSG_NOTIFY);
end;
s.Seek(offset, TSeekOrigin.soBeginning);
- ReadLFH(s, aname, csize, usize, comp, crc);
- finally
+ ReadLFH(s, name, comment, csize, usize, comp, crc, mtime, flags);
s.Seek(next, TSeekOrigin.soBeginning);
- FreeMem(name);
- end;
+ end
+ else
+ raise Exception.Create('Empty files names not supported');
end
else
- raise Exception.Create('Empty files names not supported');
+ raise Exception.Create('Splitted archives not supported');
end
else
- raise Exception.Create('Splitted archives not supported');
+ begin
+ FLastError := DFWAD_ERROR_WRONGVERSION;
+ raise Exception.Create('ZIP64 archives not supported');
+ end;
end
else
begin
- FLastError := DFWAD_ERROR_WRONGVERSION;
- raise Exception.Create('ZIP64 not supported');
+ FLastError := DFWAD_ERROR_READWAD;
+ raise Exception.Create('Patch archives not supported');
end;
end
else
var idisk, ndisk, nrec, total, comlen: UInt16;
var csize, cpos, i: UInt32;
var mypos: UInt64;
+ var tmp: PChar;
+ var utf8: Boolean;
begin
FLastError := DFWAD_ERROR_FILENOTWAD;
FVersion := 0;
begin
if total > 0 then
begin
+ utf8 := True;
+ if comlen > 0 then
+ begin
+ GetMem(tmp, UInt32(comlen) + 1);
+ try
+ s.ReadBuffer(tmp[0], comlen);
+ tmp[comlen] := #0;
+ FComment := tmp;
+ if IsUTF8(FComment) = False then
+ begin
+ FComment := win2utf(FComment);
+ utf8 := False;
+ end;
+ finally
+ FreeMem(tmp);
+ end;
+ end;
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ begin
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': UTF8 Comaptible : ' + BoolToStr(utf8, True), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Comment : "' + FComment + '"', MSG_NOTIFY);
+ end;
i := 0;
s.Seek(cpos, TSeekOrigin.soBeginning);
while i < nrec do
raise Exception.Create('EOCD not found (corrupted file?)');
end
else
- raise Exception.Create('Not DFZIP formated file');
+ raise Exception.Create('Not DFZIP formatted file');
end;
function TZIPEditor.ReadFile2(FileName: String): Boolean;
begin
if gWADEditorLogLevel >= DFWAD_LOG_INFO then
e_WriteLog('ZIP: Failed to read ZIP from file ' + FileName + ', reason: ' + e.Message, MSG_WARNING);
- FreeWAD();
+ Clear();
end;
end;
except
begin
if gWADEditorLogLevel >= DFWAD_LOG_INFO then
e_WriteLog('DFZIP: Failed to read ZIP from memory, reason: ' + e.Message, MSG_WARNING);
- FreeWAD();
+ Clear();
end;
end;
end;
procedure TZIPEditor.RemoveResource(Section, Resource: String);
var p: PSection; i: Integer;
begin
+ Section := win2utf(Section);
+ Resource := win2utf(Resource);
p := FindSection(Section);
i := FindResourceID(p, Resource);
if i >= 0 then
Result := version;
end;
- procedure TZIPEditor.WriteLFH(s: TStream; comp, crc, csize, usize: UInt32; const afname: AnsiString);
- var fname: PChar; version: UInt8; fnlen, flags: UInt16; mypos: UInt64;
+ procedure TZIPEditor.WriteLFH(s: TStream; flags, comp, mtime, crc, csize, usize: UInt32; const name: AnsiString);
+ var version: UInt8; fnlen: UInt16; mypos: UInt64;
begin
mypos := s.Position;
- fname := PChar(afname);
- fnlen := Length(fname);
- flags := 0;
- if IsASCII(afname) = False then
+ fnlen := Length(name);
+ if IsASCII(name) = False then
flags := flags or ZIP_UTF8_MASK;
- version := GetZIPVersion(afname, flags, comp);
+ version := GetZIPVersion(name, flags, comp);
if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
begin
e_WriteLog('==============================================', MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Min System : ' + IntToStr(ZIP_SYSTEM), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Flags : $' + IntToHex(flags, 4), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Compression : ' + IntToStr(comp), MSG_NOTIFY);
- e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Modification Time : $' + IntToHex(0, 8), MSG_NOTIFY);
+ e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Modification Time : ' + DosToStr(mtime), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': CRC-32 : $' + IntToHex(crc, 8), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Compressed size : ' + IntToStr(csize), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Decompressed size : ' + IntToStr(usize), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Name Length : ' + IntToStr(fnlen), MSG_NOTIFY);
e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Extension Length : ' + IntToStr(0), MSG_NOTIFY);
- e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Name : "' + fname + '"', MSG_NOTIFY);
+ e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Name : "' + name + '"', MSG_NOTIFY);
end;
s.WriteBuffer(ZIP_SIGN_LFH, 4); // LFH Signature
s.WriteByte(version); // Min version
s.WriteByte(ZIP_SYSTEM); // System
WriteInt(s, UInt16(flags)); // Flags
WriteInt(s, UInt16(comp)); // Compression method
- WriteInt(s, UInt32(0)); // Modification time/date
+ WriteInt(s, UInt32(mtime)); // Modification time/date
WriteInt(s, UInt32(crc)); // CRC-32
WriteInt(s, UInt32(csize)); // Compressed size
WriteInt(s, UInt32(usize)); // Decompressed size
WriteInt(s, UInt16(fnlen)); // Name field length
WriteInt(s, UInt16(0)); // Extra field length
- s.WriteBuffer(fname[0], fnlen); // File Name
+ s.WriteBuffer(name[1], fnlen); // File Name
end;
- procedure TZIPEditor.WriteCDR(s: TStream; comp, crc, csize, usize, eattr, offset: UInt32; const afname: AnsiString; cdrid: Integer);
- var fname: PChar; version: UInt8; fnlen, flags: UInt16; mypos: UInt64;
+ procedure TZIPEditor.WriteCDR(s: TStream; flags, comp, mtime, crc, csize, usize, eattr, offset: UInt32; const name, com: AnsiString; cdrid: Integer);
+ var version: UInt8; fnlen, fclen: UInt16; mypos: UInt64;
begin
mypos := s.Position;
- fname := PChar(afname);
- fnlen := Length(fname);
- flags := 0;
- if IsASCII(afname) = False then
+ fnlen := Length(name);
+ fclen := Length(com);
+ if (IsASCII(name) = False) or (IsASCII(com) = False) then
flags := flags or ZIP_UTF8_MASK;
- version := GetZIPVersion(afname, flags, comp);
+ version := GetZIPVersion(name, flags, comp);
if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
begin
e_WriteLog('==============================================', MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Min System : ' + IntToStr(ZIP_SYSTEM), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Flags : $' + IntToHex(flags, 4), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Compression : ' + IntToStr(comp), MSG_NOTIFY);
- e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Modification Time : $' + IntToHex(0, 8), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Modification Time : ' + DosToStr(mtime), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': CRC-32 : $' + IntToHex(crc, 8), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Compressed size : ' + IntToStr(csize), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Decompressed size : ' + IntToStr(usize), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Name Length : ' + IntToStr(fnlen), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Extension Length : ' + IntToStr(0), MSG_NOTIFY);
- e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Comment Length : ' + IntToStr(0), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Comment Length : ' + IntToStr(fclen), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Disk : ' + IntToStr(0), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Internal Attrib : $' + IntToHex(0, 4), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': External Attrib : $' + IntToHex(eattr, 8), MSG_NOTIFY);
e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': LFH Offset : $' + IntToHex(offset, 8), MSG_NOTIFY);
- e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Name : "' + fname + '"', MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Name : "' + name + '"', MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Comment : "' + com + '"', MSG_NOTIFY);
end;
s.WriteBuffer(ZIP_SIGN_CDR, 4); // CDR Signature
s.WriteByte(ZIP_MAXVERSION); // Used version
s.WriteByte(ZIP_SYSTEM); // Min system
WriteInt(s, UInt16(flags)); // Flags
WriteInt(s, UInt16(comp)); // Compression method
- WriteInt(s, UInt32(0)); // Modification time/date
+ WriteInt(s, UInt32(mtime)); // Modification time/date
WriteInt(s, UInt32(crc)); // CRC-32
WriteInt(s, UInt32(csize)); // Compressed size
WriteInt(s, UInt32(usize)); // Decompressed size
WriteInt(s, UInt16(fnlen)); // Name field length
WriteInt(s, UInt16(0)); // Extra field length
- WriteInt(s, UInt16(0)); // Comment field length
+ WriteInt(s, UInt16(fclen)); // Comment field length
WriteInt(s, UInt16(0)); // Disk
WriteInt(s, UInt16(0)); // Internal attributes
WriteInt(s, UInt32(eattr)); // External attributes
WriteInt(s, UInt32(offset)); // LFH offset
- s.WriteBuffer(fname[0], fnlen); // File Name
+ s.WriteBuffer(name[1], fnlen); // File Name
+ s.WriteBuffer(com[1], fclen); // Comment
end;
procedure TZIPEditor.SaveToStream(s: TStream);
var i, j: Integer;
- var start, offset, loffset, size, zcrc, count: UInt32;
+ var start, offset, loffset, size, zcrc, count, comlen: UInt32;
var p: PResource;
var afname: AnsiString;
var mypos: UInt64;
begin
p := @FSection[i].list[j];
afname := GetFileName(FSection[i].name, p.name);
- WriteLFH(s, p.comp, p.chksum, p.csize, p.usize, afname);
+ WriteLFH(s, p.flags, p.comp, p.mtime, p.chksum, p.csize, p.usize, afname);
if p.stream <> nil then
begin
Assert(p.stream.Size = p.csize);
else
begin
afname := GetFileName(FSection[i].name, '');
- WriteLFH(s, ZIP_COMP_STORE, zcrc, 0, 0, afname);
+ WriteLFH(s, 0, ZIP_COMP_STORE, FSection[i].mtime, zcrc, 0, 0, afname);
end;
end;
end;
begin
p := @FSection[i].list[j];
afname := GetFileName(FSection[i].name, p.name);
- WriteCDR(s, p.comp, p.chksum, p.csize, p.usize, $00, loffset, afname, i);
+ WriteCDR(s, p.flags, p.comp, p.mtime, p.chksum, p.csize, p.usize, $00, loffset, afname, p.comment, i);
loffset := loffset + 30 + Length(afname) + p.csize;
Inc(count);
end;
else
begin
afname := GetFileName(FSection[i].name, '');
- WriteCDR(s, ZIP_COMP_STORE, zcrc, 0, 0, $10, loffset, afname, i);
+ WriteCDR(s, 0, ZIP_COMP_STORE, FSection[i].mtime, zcrc, 0, 0, $10, loffset, afname, FSection[i].comment, i);
loffset := loffset + 30 + Length(afname) + 0;
Inc(count);
end;
size := s.Position - start - offset;
// Write EOCD header
mypos := s.Position;
+ comlen := Length(FComment);
if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
begin
e_WriteLog('==============================================', MSG_NOTIFY);
e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Total CDR''s : ' + IntToStr(count), MSG_NOTIFY);
e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': CD Length : ' + IntToStr(size), MSG_NOTIFY);
e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': CD Offset : $' + IntToHex(offset, 8), MSG_NOTIFY);
- e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Comment Length : ' + IntToStr(0), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Comment Length : ' + IntToStr(comlen), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Comment : "' + FComment + '"', MSG_NOTIFY);
e_WriteLog('==============================================', MSG_NOTIFY);
end;
s.WriteBuffer(ZIP_SIGN_EOCD, 4); // EOCD Signature
WriteInt(s, UInt16(count)); // Total CDR entries
WriteInt(s, UInt32(size)); // Central Directory size
WriteInt(s, UInt32(offset)); // Central Directory offset
- WriteInt(s, UInt16(0)); // Comment field length
+ WriteInt(s, UInt16(comlen)); // Comment field length
+ s.WriteBuffer(FComment[1], comlen); // Comment
end;
procedure TZIPEditor.SaveTo(FileName: String);