index c73811a3c447bd639755ddd8587c52804610428a..f250e2c0a05c8fc3fe1a2ce98b9debc9092c0392 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
usize: UInt32;
comp: UInt32;
chksum: UInt32;
+ mtime: UInt32;
+ flags: UInt32;
stream: TMemoryStream;
end;
TSection = record
name: AnsiString;
+ mtime: UInt32;
list: array of TResource;
end;
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): PSection;
function FindSectionID(name: AnsiString): Integer;
function FindSection(name: AnsiString): PSection;
- function InsertSection(name: AnsiString): PSection;
+ function InsertSection(name: AnsiString; mtime: UInt32): 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): PResource;
function Preload(p: PResource): Boolean;
function GetSourceStream(p: PResource): TStream;
- procedure ReadLFH(s: TStream; fname: AnsiString; xcsize, xusize, xcomp, xcrc: UInt32);
+ procedure ReadLFH(s: TStream; fname: 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 afname: AnsiString);
+ procedure WriteCDR(s: TStream; flags, comp, mtime, crc, csize, usize, eattr, offset: UInt32; const afname: 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;
+ 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;
Result := nil;
end;
- function TZIPEditor.InsertSectionRAW(name: AnsiString): PSection;
+ function TZIPEditor.InsertSectionRAW(name: AnsiString; mtime: UInt32): 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;
Result := @FSection[i];
end;
Result := FindSectionRAW(fixName, False); // CASENAME
end;
- function TZIPEditor.InsertSection(name: AnsiString): PSection;
+ function TZIPEditor.InsertSection(name: AnsiString; mtime: UInt32): PSection;
begin
Result := FindSection(name);
if Result = nil then
- Result := InsertSectionRAW(name);
+ Result := InsertSectionRAW(name, mtime);
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): 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].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
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: 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);
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);
end;
if p = nil then
raise Exception.Create('Failed to register resource [' + fname + ']');
var mypos, next: UInt64;
var name: PChar;
var aname: AnsiString;
+ var cvtbug, utf8: Boolean;
begin
mypos := s.Position;
s.ReadBuffer(sig[0], 4);
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);
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
try
s.ReadBuffer(name[0], fnlen);
name[fnlen] := #0;
- // TODO: when packer version < 63 detect utf8 by hands?
- if flags and ZIP_UTF8_MASK = 0 then
- aname := win2utf(name)
- else
- aname := name;
+ aname := name;
+ utf8 := True;
+ if (flags and ZIP_UTF8_MASK = 0) and (IsUTF8(name) = False) then
+ begin
+ aname := win2utf(aname);
+ 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);
+ end;
s.Seek(offset, TSeekOrigin.soBeginning);
- ReadLFH(s, aname, csize, usize, comp, crc);
+ ReadLFH(s, aname, csize, usize, comp, crc, mtime, flags);
finally
s.Seek(next, TSeekOrigin.soBeginning);
FreeMem(name);
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;
- 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 GetZIPVersion(const afname: AnsiString; flags, comp: UInt16): UInt8;
var version: UInt8;
begin
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 afname: AnsiString);
+ var fname: PChar; version: UInt8; fnlen: UInt16; mypos: UInt64;
begin
mypos := s.Position;
fname := PChar(afname);
fnlen := Length(fname);
- flags := 0;
if IsASCII(afname) = False then
flags := flags or ZIP_UTF8_MASK;
version := GetZIPVersion(afname, flags, comp);
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);
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
s.WriteBuffer(fname[0], 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 afname: AnsiString; cdrid: Integer);
+ var fname: PChar; version: UInt8; fnlen: UInt16; mypos: UInt64;
begin
mypos := s.Position;
fname := PChar(afname);
fnlen := Length(fname);
- flags := 0;
if IsASCII(afname) = False then
flags := flags or ZIP_UTF8_MASK;
version := GetZIPVersion(afname, flags, comp);
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);
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
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, 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, i);
loffset := loffset + 30 + Length(afname) + 0;
Inc(count);
end;