index f7abf9e9bb1d8ac3a7532870861d4040d5f9247d..42816ab40d1b099922b82f2c8f4e2b01003ae256 100644 (file)
// - File must start with LFH or EOCD signature
// - EOCD must be located strictly at the end of file
// - Multi-disk ZIP files are not supported
-// - UTF-8 not supported yet, expected WIN1251 encoding
+// - Expect UTF-8 or CP1251 encoded names
// - ZIP64 not supported
// - 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;
- function ReadLFH(s: TStream; fname: AnsiString; xcsize, xusize, xcomp, xcrc: UInt32): Boolean;
- function ReadCDR(s: TStream): Boolean;
+ 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;
- function ReadEOCD(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, attr, offset: UInt32; const afname: AnsiString);
+ 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, zstream, crc, e_log;
+ uses SysUtils, StrUtils, DateUtils, Math, utils, zstream, crc, e_log;
const
ZIP_SIGN_CDR = 'PK'#1#2;
ZIP_SIGN_EOCD = 'PK'#5#6;
const
- ZIP_COMP_STORE = 0;
- ZIP_COMP_DEFLATE = 8;
+ ZIP_COMP_STORE = 0;
+ ZIP_COMP_SHRUNK = 1;
+ ZIP_COMP_REDUCE1 = 2;
+ ZIP_COMP_REDUCE2 = 3;
+ ZIP_COMP_REDUCE3 = 4;
+ ZIP_COMP_REDUCE4 = 5;
+ ZIP_COMP_IMPLODE = 6;
+ ZIP_COMP_TOKENIZED = 7;
+ ZIP_COMP_DEFLATE = 8;
+ ZIP_COMP_DEFLATE64 = 9;
+ ZIP_COMP_TERSE1 = 10;
+ ZIP_COMP_BZIP2 = 12;
+ ZIP_COMP_LZMA = 14;
+ ZIP_COMP_CMPSC = 16;
+ ZIP_COMP_TERSE2 = 18;
+ ZIP_COMP_LZ77 = 19;
+ ZIP_COMP_ZSTD1 = 20;
+ ZIP_COMP_ZSTD2 = 93;
+ ZIP_COMP_MP3 = 94;
+ ZIP_COMP_XZ = 95;
+ ZIP_COMP_JPEG = 96;
+ ZIP_COMP_WAVPACK = 97;
+ ZIP_COMP_PPMD = 98;
+ ZIP_COMP_AE = 99;
const
ZIP_SYSTEM = 0; // DOS / FAT
- ZIP_VERSION = 20; // Min version
ZIP_MAXVERSION = 63; // Max supported version
+ 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;
+ begin
+ for i := 1 to Length(s) do
+ begin
+ if s[i] >= #$80 then
+ begin
+ Result := False;
+ exit;
+ end;
+ end;
+ Result := True;
+ end;
+
+ function IsUTF8(const s: AnsiString): Boolean;
+ var i, j, len: Integer;
+ begin
+ Result := False;
+ i := 1; len := Length(s);
+ while i <= len do
+ begin
+ case Ord(s[i]) of
+ $00..$7F: j := 0;
+ $80..$BF: exit; // invalid encoding
+ $C0..$DF: j := 1;
+ $E0..$EF: j := 2;
+ $F0..$F7: j := 3;
+ otherwise exit; // invalid encoding
+ end;
+ Inc(i);
+ while j > 0 do
+ begin
+ if i > len then exit; // invlid length
+ case Ord(s[i]) of
+ $80..$BF: ; // ok
+ else exit; // invalid encoding
+ end;
+ Inc(i);
+ Dec(j);
+ end;
+ end;
+ 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
Result := False;
FLastError := DFWAD_ERROR_READWAD;
try
- s := TFileStream.Create(FileName, fmOpenRead, fmShareDenyWrite);
+ s := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
try
GetMem(ptr, s.Size);
try
finally
s.Free();
end;
- except on e: EFOpenError do
- FLastError := DFWAD_ERROR_CANTOPENWAD;
+ except
+ on e: EFOpenError do
+ begin
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('DFZIP: AddResource: failed to open file ' + FileName, MSG_NOTIFY);
+ FLastError := DFWAD_ERROR_CANTOPENWAD;
+ end;
end;
end;
begin
FSection := nil;
FStream := nil;
+ FComment := '';
FLastError := DFWAD_NOERROR;
- FVersion := ZIP_VERSION;
- FreeWAD();
+ FVersion := 10;
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 := ZIP_VERSION;
+ FVersion := 10;
end;
function TZIPEditor.Preload(p: PResource): Boolean;
Result := True;
except
s.Free();
- raise;
end;
end;
end;
begin
if FStream = nil then
begin
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ e_WriteLog('DFZIP: CreateImage: File not assigned', MSG_NOTIFY);
FLastError := DFWAD_ERROR_WADNOTLOADED;
end
else if FStream is TMemoryStream then
begin
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ e_WriteLog('DFZIP: CreateImage: Memory stream', MSG_NOTIFY);
FLastError := DFWAD_NOERROR;
end
else
begin
if Preload(@FSection[i].list[j]) = False then
begin
+ if gWADEditorLogLevel >= DFWAD_LOG_WARN then
+ e_WriteLog('DFZIP: CreateImage: failed to preload resource [' + FSection[i].name + '][' + FSection[i].list[j].name + ']', MSG_WARNING);
FLastError := DFWAD_ERROR_CANTOPENWAD;
exit;
end;
procedure TZIPEditor.AddSection(Name: String);
begin
- if InsertSection(Name) = nil then
- raise Exception.Create('ZIP: AddSection: failed to add section');
+ 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;
begin
case p.comp of
ZIP_COMP_STORE:
- if p.csize = p.usize then
begin
+ Assert(p.csize = p.usize);
GetMem(ptr, p.usize);
try
- src.ReadBuffer(ptr[0], p.usize);
- Result := True;
- except
- FreeMem(ptr);
+ try
+ src.ReadBuffer(ptr[0], p.usize);
+ Result := True;
+ except
+ FreeMem(ptr);
+ raise;
+ end;
+ except on e: EReadError do
+ if gWADEditorLogLevel >= DFWAD_LOG_WARN then
+ e_WriteLog('DFZIP: Failed to read STOREd data, reason: ' + e.Message, MSG_WARNING);
end;
end;
ZIP_COMP_DEFLATE:
- begin
+ try
tmp := TDecompressionStream.Create(src, True);
try
GetMem(ptr, p.usize);
Result := True;
except
FreeMem(ptr);
+ raise;
end;
finally
tmp.Free();
end;
+ except
+ on e: EStreamError do
+ begin
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('DFZIP: Failed to decompress DEFLATEd data, reason: ' + e.Message, MSG_WARNING);
+ raise e;
+ end;
end;
+ otherwise
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('DFZIP: Unsupported compression method: ' + IntToStr(p.comp), MSG_WARNING);
end;
end
else
begin
+ if gWADEditorLogLevel >= DFWAD_LOG_WARN then
+ e_WriteLog('DFZIP: No available source for file data', MSG_WARNING);
FLastError := DFWAD_ERROR_WADNOTLOADED;
end;
if Result = True then
end
else
begin
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('DFZIP: File integrity check failed: expected CRC32 $' + IntToHex(p.chksum, 8) + ', calculated CRC32 $' + IntToHex(crc, 8), MSG_WARNING);
FreeMem(ptr);
end;
end;
end
else
begin
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ e_WriteLog('DFZIP: Resource not found', MSG_NOTIFY);
FLastError := DFWAD_ERROR_RESOURCENOTFOUND;
end;
end;
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;
- function TZIPEditor.ReadLFH(s: TStream; fname: AnsiString; xcsize, xusize, xcomp, xcrc: UInt32): Boolean;
+ procedure TZIPEditor.ReadLFH(s: TStream; fname, xcomment: AnsiString; xcsize, xusize, xcomp, xcrc, xtime, xflags: UInt32);
var sig: packed array [0..3] of Char;
- var v, flags, comp: UInt16;
+ var va, vb, flags, comp: UInt16;
var mtime, crc, csize, usize: UInt32;
var fnlen, extlen: UInt16;
- var datapos: UInt64;
+ var mypos, datapos: UInt64;
var section, name: AnsiString;
+ var p: Pointer;
begin
- Result := False;
- if s.Position + 30 <= s.Size then
+ mypos := s.Position;
+ if mypos + 30 <= s.Size then
begin
s.ReadBuffer(sig[0], 4);
if sig = ZIP_SIGN_LFH then
begin
- v := LEtoN(s.ReadWord());
+ va := s.ReadByte(); // Min Version
+ vb := s.ReadByte(); // Min System
flags := LEtoN(s.ReadWord());
comp := LEtoN(s.ReadWord());
mtime := LEtoN(s.ReadDWord());
fnlen := LEtoN(s.ReadWord());
extlen := LEtoN(s.ReadWord());
datapos := s.Position + fnlen + extlen;
- if datapos + xcsize <= s.Size then
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
begin
- // Valid Record Size
- ToSectionFile(fname, section, name);
- if name = '' then
- Result := InsertSection(section) <> nil
+ e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Min Version : ' + IntToStr(va), MSG_NOTIFY);
+ 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 : ' + 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(extlen), MSG_NOTIFY);
+ e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': <DATA OFFSET> : $' + IntToHex(datapos, 8), MSG_NOTIFY);
+ end;
+ if (va >= 10) and (va <= ZIP_MAXVERSION) then
+ begin
+ if datapos + xcsize <= s.Size then
+ begin
+ ToSectionFile(fname, section, name);
+ if name = '' then
+ begin
+ p := FindSectionRAW(section, True);
+ if p = nil then
+ p := InsertSectionRAW(section, xtime, xcomment);
+ end
+ else
+ begin
+ 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 + ']');
+ end
else
- Result := InsertFileInfo(section, name, datapos, xcsize, xusize, xcomp, xcrc) <> nil;
+ raise Exception.Create('Invalid LFH size (corrupted file?)');
+ end
+ else
+ begin
+ FLastError := DFWAD_ERROR_WRONGVERSION;
+ raise Exception.Create('Unsupported CDR version ' + IntToStr(va) + ', not in range [10..' + IntToStr(ZIP_MAXVERSION) + ']');
end;
- end;
- end;
+ end
+ else
+ raise Exception.Create('Invalid LFH signature $' +IntToHex(Ord(sig[0]), 2) + ' $' +IntToHex(Ord(sig[1]), 2) + ' $' +IntToHex(Ord(sig[2]), 2) + ' $' +IntToHex(Ord(sig[3]), 2) + ' (corrupted file?)');
+ end
+ else
+ raise Exception.Create('Invalid LFH size (corrupted file?)');
end;
- function TZIPEditor.ReadCDR(s: TStream): Boolean;
+ procedure TZIPEditor.ReadCDR(s: TStream; cdrid: Integer);
var sig: packed array [0..3] of Char;
- var v, va, vb, flags, comp: UInt16;
+ var vva, vvb, va, vb, flags, comp: UInt16;
var mtime, crc, csize, usize: UInt32;
var fnlen, extlen, comlen, disk, iattr: UInt16;
var eattr, offset: UInt32;
- var next: UInt64;
- var name: PChar;
+ var mypos, next: UInt64;
+ var tmp: PChar;
+ var name, comment: AnsiString;
+ var cvtbug, utf8: Boolean;
begin
- Result := False;
+ mypos := s.Position;
s.ReadBuffer(sig[0], 4);
if sig = ZIP_SIGN_CDR then
begin
// Valid Central Directory Signature
- v := LEtoN(s.ReadWord());
- va := s.ReadByte(); // Min Version
- vb := s.ReadByte(); // Min System
+ vva := s.ReadByte(); // Writer Version
+ vvb := s.ReadByte(); // Writer System
+ va := s.ReadByte(); // Min Version
+ vb := s.ReadByte(); // Min System
flags := LEtoN(s.ReadWord());
comp := LEtoN(s.ReadWord());
mtime := LEtoN(s.ReadDWord());
offset := LEtoN(s.ReadDWord());
next := s.Position + fnlen + extlen + comlen;
FVersion := va;
- if va <= ZIP_MAXVERSION then
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
begin
- if (flags and ((1 << 0) or (1 << 6) or (1 << 13))) = 0 then
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Writer Version : ' + IntToStr(vva), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Writer System : ' + IntToStr(vvb), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Min Version : ' + IntToStr(va), MSG_NOTIFY);
+ 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 : ' + 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(extlen), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Comment Length : ' + IntToStr(comlen), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Disk : ' + IntToStr(disk), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Internal Attrib : $' + IntToHex(iattr, 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);
+ end;
+ cvtbug := False;
+ if (vva = $10) and (vvb = $0A) and (va = $10) and (vb = $00) and (flags = (1 << 10)) and (mtime = 0) and (iattr = 0) and (eattr = 0) then
+ begin
+ // HACK: Editor and wadcvt for long time sets incorrent flag for UTF-8
+ flags := ZIP_UTF8_MASK;
+ cvtbug := True;
+ end;
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': WADCVT BUG : ' + BoolToStr(cvtbug, True), MSG_NOTIFY);
+ if (va >= 10) and (va <= ZIP_MAXVERSION) then
+ begin
+ if (flags and ZIP_ENCRYPTION_MASK) = 0 then
begin
- // TODO: check bit 11 (UTF8 name and comment)
- if (csize <> $ffffffff) and (usize <> $ffffffff) and (disk <> $ffff) and (offset <> $ffffffff) then
+ if (flags and ZIP_PATCH_MASK) = 0 then
begin
- // Old Style ZIP
- if disk = 0 then
+ if (csize <> $ffffffff) and (usize <> $ffffffff) and (disk <> $ffff) and (offset <> $ffffffff) then
begin
- // Single Volume ZIP
- if (next <= s.Size) and (fnlen > 0) then
+ if disk = 0 then
begin
- // Valid Central Directory Entry
- GetMem(name, UInt32(fnlen) + 1);
- try
- s.ReadBuffer(name[0], fnlen);
- name[fnlen] := #0;
+ 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 (utf8 = False) or (flags and ZIP_UTF8_MASK = 0) and (IsUTF8(name) = False) then
+ begin
+ 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 : "' + name + '"', MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Comment : "' + comment + '"', MSG_NOTIFY);
+ end;
s.Seek(offset, TSeekOrigin.soBeginning);
- Result := ReadLFH(s, name, csize, usize, comp, crc);
- finally
+ ReadLFH(s, name, comment, csize, usize, comp, crc, mtime, flags);
s.Seek(next, TSeekOrigin.soBeginning);
- FreeMem(name);
- end;
- end;
+ end
+ else
+ raise Exception.Create('Empty files names not supported');
+ end
+ else
+ raise Exception.Create('Splitted archives not supported');
+ end
+ else
+ begin
+ FLastError := DFWAD_ERROR_WRONGVERSION;
+ raise Exception.Create('ZIP64 archives not supported');
end;
end
else
begin
- // ZIP64
- FLastError := DFWAD_ERROR_WRONGVERSION;
+ FLastError := DFWAD_ERROR_READWAD;
+ raise Exception.Create('Patch archives not supported');
end;
end
else
begin
- // Encrypted file
FLastError := DFWAD_ERROR_READWAD;
+ raise Exception.Create('Encrypted archives not supported');
end;
end
else
begin
- // Unsupported version
FLastError := DFWAD_ERROR_WRONGVERSION;
+ raise Exception.Create('Unsupported CDR version ' + IntToStr(va) + ', not in range [10..' + IntToStr(ZIP_MAXVERSION) + ']');
end;
- end;
+ end
+ else
+ raise Exception.Create('Invalid CDR signature $' + IntToHex(Ord(sig[0]), 2) + ' $' +IntToHex(Ord(sig[1]), 2) + ' $' +IntToHex(Ord(sig[2]), 2) + ' $' +IntToHex(Ord(sig[3]), 2) + ' (corrupted file?)');
end;
function TZIPEditor.FindEOCD(s: TStream): Boolean;
end;
end;
- function TZIPEditor.ReadEOCD(s: TStream): Boolean;
+ procedure TZIPEditor.ReadEOCD(s: TStream);
var sig: packed array [0..3] of Char;
var idisk, ndisk, nrec, total, comlen: UInt16;
var csize, cpos, i: UInt32;
+ var mypos: UInt64;
+ var tmp: PChar;
+ var utf8: Boolean;
begin
- Result := False;
FLastError := DFWAD_ERROR_FILENOTWAD;
FVersion := 0;
s.ReadBuffer(sig[0], 4);
begin
// End of Central Directory found
FLastError := DFWAD_ERROR_READWAD;
+ mypos := s.Position - 4;
idisk := LEtoN(s.ReadWord());
ndisk := LEtoN(s.ReadWord());
nrec := LEtoN(s.ReadWord());
csize := LEtoN(s.ReadDWord());
cpos := LEtoN(s.ReadDWord());
comlen := LEtoN(s.ReadWord());
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ begin
+ e_WriteLog('==============================================', MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Disk ID : ' + IntToStr(idisk), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Disk ID with CD : ' + IntToStr(ndisk), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Available CDR''s : ' + IntToStr(nrec), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Total CDR''s : ' + IntToStr(total), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': CD Length : ' + IntToStr(csize), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': CD Offset : $' + IntToHex(cpos, 8), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Comment Length : ' + IntToStr(comlen), MSG_NOTIFY);
+ end;
if (idisk <> $ffff) and (ndisk <> $ffff) and (nrec <> $ffff) and (total <> $ffff) and (csize <> $ffffffff) and (cpos <> $ffffffff) then
begin
- // Old Style ZIP
if s.Position + comlen = s.Size then
begin
- // Valid End of Central Directory size (located exactly at the end of file)
if (idisk = 0) and (ndisk = 0) and (nrec = total) then
begin
- // Single volume ZIP
- if (UInt64(cpos) + csize <= s.Size) then
+ if (nrec * 46 <= csize) and (UInt64(cpos) + csize <= s.Size) then
begin
- // Valid Cental Directry Record position and size
- Result := True;
if total > 0 then
begin
- // At least one Central Directry present
+ 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) and (Result = True) do
+ while i < nrec do
begin
- Result := ReadCDR(s);
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ e_WriteLog('==============================================', MSG_NOTIFY);
+ ReadCDR(s, i);
Inc(i);
end;
- // if Result = False then
- // writeln('Invalid Central Directory #', i - 1);
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ e_WriteLog('==============================================', MSG_NOTIFY);
end;
- end;
- end;
- end;
+ end
+ else
+ raise Exception.Create('Central Directory too big (corrupted file?)');
+ end
+ else
+ raise Exception.Create('Splitted archives not supported');
+ end
+ else
+ raise Exception.Create('EOCD too big (corrupted file?)');
end
else
- begin
- // ZIP64
- FLastError := DFWAD_ERROR_WRONGVERSION;
- end;
- end;
- end;
+ raise Exception.Create('ZIP64 not supported');
+ end
+ else
+ raise Exception.Create('EOCD not found (corrupted file?)');
+ end
+ else
+ raise Exception.Create('Not DFZIP formatted file');
end;
function TZIPEditor.ReadFile2(FileName: String): Boolean;
FreeWAD();
Result := False;
try
- s := TFileStream.Create(FileName, fmOpenRead, fmShareDenyWrite);
try
- Result := ReadEOCD(s);
- if Result = True then
- begin
+ s := TFileStream.Create(FileName, fmOpenRead or fmShareDenyWrite);
+ try
+ ReadEOCD(s);
FStream := s;
FLastError := DFWAD_NOERROR;
- end
- else
- begin
- FStream := nil;
+ Result := True;
+ except
s.Free();
+ raise;
end;
except
- s.Free();
+ on e: Exception do
+ begin
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('ZIP: Failed to read ZIP from file ' + FileName + ', reason: ' + e.Message, MSG_WARNING);
+ Clear();
+ end;
+ end;
+ except
+ on e: EFOpenError do
+ begin
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('DFZIP: Failed to open file ' + FileName + ', reason: ' + e.Message, MSG_WARNING);
+ if FileExists(FileName) then
+ FLastError := DFWAD_ERROR_CANTOPENWAD
+ else
+ FLastError := DFWAD_ERROR_WADNOTFOUND;
end;
- except on e: EFOpenError do
- if FileExists(FileName) then
- FLastError := DFWAD_ERROR_CANTOPENWAD
- else
- FLastError := DFWAD_ERROR_WADNOTFOUND;
end;
end;
begin
FreeWAD();
Result := False;
- s := TMemoryStream.Create;
try
- s.SetSize(Len);
- s.WriteBuffer(PByte(Data)[0], Len);
- s.Seek(0, soBeginning);
- Result := ReadEOCD(s);
- if Result = True then
- begin
+ s := TMemoryStream.Create;
+ try
+ s.SetSize(Len);
+ s.WriteBuffer(PByte(Data)[0], Len);
+ s.Seek(0, soBeginning);
+ ReadEOCD(s);
FStream := s;
FLastError := DFWAD_NOERROR;
- end
- else
- begin
- FStream := nil;
+ Result := True;
+ except
s.Free();
+ raise;
end;
except
- s.Free();
- raise;
+ on e: Exception do
+ begin
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('DFZIP: Failed to read ZIP from memory, reason: ' + e.Message, MSG_WARNING);
+ 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
end;
end;
- procedure TZIPEditor.WriteLFH(s: TStream; comp, crc, csize, usize: UInt32; const afname: AnsiString);
- var fname: PChar; flen: UInt16;
+ function GetZIPVersion(const afname: AnsiString; flags, comp: UInt16): UInt8;
+ var version: UInt8;
+ begin
+ version := 10; // Base version
+ case comp of
+ ZIP_COMP_STORE: version := 10;
+ ZIP_COMP_SHRUNK: version := 10;
+ ZIP_COMP_REDUCE1: version := 10;
+ ZIP_COMP_REDUCE2: version := 10;
+ ZIP_COMP_REDUCE3: version := 10;
+ ZIP_COMP_REDUCE4: version := 10;
+ ZIP_COMP_IMPLODE: version := 10;
+ ZIP_COMP_TOKENIZED: version := 20;
+ ZIP_COMP_DEFLATE: version := 20;
+ ZIP_COMP_DEFLATE64: version := 21;
+ ZIP_COMP_TERSE1: version := 25; // PKWARE DCL Implode
+ ZIP_COMP_BZIP2: version := 46;
+ ZIP_COMP_LZMA: version := 63;
+ ZIP_COMP_CMPSC: version := 63;
+ ZIP_COMP_TERSE2: version := 63;
+ ZIP_COMP_LZ77: version := 63;
+ ZIP_COMP_ZSTD1: version := 63;
+ ZIP_COMP_ZSTD2: version := 63;
+ ZIP_COMP_MP3: version := 63;
+ ZIP_COMP_XZ: version := 63;
+ ZIP_COMP_JPEG: version := 63;
+ ZIP_COMP_WAVPACK: version := 63;
+ ZIP_COMP_PPMD: version := 63;
+ ZIP_COMP_AE: version := 63;
+ end;
+ if afname[Length(afname)] = '/' then
+ version := Max(20, version); // Folder
+ if flags and ZIP_UTF8_MASK <> 0 then
+ version := Max(63, version); // UTF-8 name
+ Result := version;
+ end;
+
+ procedure TZIPEditor.WriteLFH(s: TStream; flags, comp, mtime, crc, csize, usize: UInt32; const name: AnsiString);
+ var version: UInt8; fnlen: UInt16; mypos: UInt64;
begin
- fname := PChar(afname);
- flen := Length(fname);
+ mypos := s.Position;
+ fnlen := Length(name);
+ if IsASCII(name) = False then
+ flags := flags or ZIP_UTF8_MASK;
+ version := GetZIPVersion(name, flags, comp);
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ begin
+ e_WriteLog('==============================================', MSG_NOTIFY);
+ e_WriteLog('LFH @' + IntToHex(mypos, 8) + ': Min Version : ' + IntToStr(version), 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 : ' + 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 : "' + name + '"', MSG_NOTIFY);
+ end;
s.WriteBuffer(ZIP_SIGN_LFH, 4); // LFH Signature
- s.WriteByte(ZIP_VERSION); // Min version
+ s.WriteByte(version); // Min version
s.WriteByte(ZIP_SYSTEM); // System
- s.WriteWord(NtoLE(0)); // Flags
- s.WriteWord(NtoLE(comp)); // Compression method
- s.WriteDWord(NtoLE(0)); // Modification time/date
- s.WriteDWord(NtoLE(crc)); // CRC-32
- s.WriteDWord(NtoLE(csize)); // Compressed size
- s.WriteDWord(NtoLE(usize)); // Decompressed size
- s.WriteWord(NtoLE(flen)); // Name field length
- s.WriteWord(NtoLE(0)); // Extra field length
- s.WriteBuffer(fname[0], flen); // File Name
+ WriteInt(s, UInt16(flags)); // Flags
+ WriteInt(s, UInt16(comp)); // Compression method
+ 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(name[1], fnlen); // File Name
end;
- procedure TZIPEditor.WriteCDR(s: TStream; comp, crc, csize, usize, attr, offset: UInt32; const afname: AnsiString);
- var fname: PChar; flen: UInt16;
+ 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
- fname := PChar(afname);
- flen := Length(fname);
+ mypos := s.Position;
+ fnlen := Length(name);
+ fclen := Length(com);
+ if (IsASCII(name) = False) or (IsASCII(com) = False) then
+ flags := flags or ZIP_UTF8_MASK;
+ version := GetZIPVersion(name, flags, comp);
+ if gWADEditorLogLevel >= DFWAD_LOG_DEBUG then
+ begin
+ e_WriteLog('==============================================', MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Writer Version : ' + IntToStr(ZIP_MAXVERSION), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Writer System : ' + IntToStr(ZIP_SYSTEM), MSG_NOTIFY);
+ e_WriteLog('CDR#' + IntToStr(cdrid) + ' @' + IntToHex(mypos, 8) + ': Min Version : ' + IntToStr(version), 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 : ' + 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(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 : "' + 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); // Used system
- s.WriteByte(ZIP_VERSION); // Min version
+ s.WriteByte(version); // Min version
s.WriteByte(ZIP_SYSTEM); // Min system
- s.WriteWord(NtoLE(0)); // Flags
- s.WriteWord(NtoLE(comp)); // Compression method
- s.WriteDWord(NtoLE(0)); // Modification time/date
- s.WriteDWord(NtoLE(crc)); // CRC-32
- s.WriteDWord(NtoLE(csize)); // Compressed size
- s.WriteDWord(NtoLE(usize)); // Decompressed size
- s.WriteWord(NtoLE(flen)); // Name field length
- s.WriteWord(NtoLE(0)); // Extra field length
- s.WriteWord(NtoLE(0)); // Comment field length
- s.WriteWord(NtoLE(0)); // Disk
- s.WriteWord(NtoLE(0)); // Internal attributes
- s.WriteDWord(NtoLE(attr)); // External attributes
- s.WriteDWord(NtoLE(offset)); // LFH offset
- s.WriteBuffer(fname[0], flen); // File Name
+ WriteInt(s, UInt16(flags)); // Flags
+ WriteInt(s, UInt16(comp)); // Compression method
+ 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(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(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
// Write LFH headers and data
start := s.Position;
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);
end
else
begin
- raise Exception.Create('ZIP: SaveToStream: No data source available');
+ raise Exception.Create('No data source available (somethig very wrong)');
end;
end;
end
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;
// Write CDR headers
count := 0;
- loffset := start;
+ loffset := 0;
offset := s.Position - start;
if FSection <> nil then
begin
begin
p := @FSection[i].list[j];
afname := GetFileName(FSection[i].name, p.name);
- WriteCDR(s, p.comp, p.chksum, p.csize, p.usize, 0, loffset - start, afname);
+ 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 - start, afname);
+ 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;
Assert(count < $ffff);
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) + ': Disk ID : ' + IntToStr(0), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Disk ID with CD : ' + IntToStr(0), MSG_NOTIFY);
+ e_WriteLog('EOCD @' + IntToHex(mypos, 8) + ': Available CDR''s : ' + IntToStr(count), 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(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
- s.WriteWord(NtoLE(0)); // Disk
- s.WriteWord(NtoLE(0)); // Num of Disks
- s.WriteWord(NtoLE(count)); // Num of CDRs
- s.WriteWord(NtoLE(count)); // Total CDR entries
- s.WriteDWord(NtoLE(size)); // Central Directory size
- s.WriteDWord(NtoLE(offset)); // Central Directory offset
- s.WriteWord(NtoLE(0)); // Comment field length
+ WriteInt(s, UInt16(0)); // Disk
+ WriteInt(s, UInt16(0)); // Num of Disks
+ WriteInt(s, UInt16(count)); // Num of CDRs
+ WriteInt(s, UInt16(count)); // Total CDR entries
+ WriteInt(s, UInt32(size)); // Central Directory size
+ WriteInt(s, UInt32(offset)); // Central Directory offset
+ WriteInt(s, UInt16(comlen)); // Comment field length
+ s.WriteBuffer(FComment[1], comlen); // Comment
end;
procedure TZIPEditor.SaveTo(FileName: String);
var s: TFileStream;
begin
- s := TFileStream.Create(FileName, fmCreate);
try
- SaveToStream(s);
- finally
- s.Free();
+ s := TFileStream.Create(FileName, fmCreate);
+ try
+ SaveToStream(s);
+ finally
+ s.Free();
+ end;
+ except
+ on e: Exception do
+ begin
+ if gWADEditorLogLevel >= DFWAD_LOG_INFO then
+ e_WriteLog('ZIP: Failed to create file ' + FileName + ', reason: ' + e.Message, MSG_WARNING);
+ raise e;
+ end;
end;
end;
DFWAD_ERROR_WADNOTLOADED: Result := 'DFZIP file is not loaded';
DFWAD_ERROR_READRESOURCE: Result := 'Read resource error';
DFWAD_ERROR_READWAD: Result := 'Read DFZIP error';
- otherwise Result := '';
+ otherwise Result := IntToStr(FLastError);
end;
end;