index c01fe7fa5bca8d7ebaa01d62a52cfb48467dc65c..42816ab40d1b099922b82f2c8f4e2b01003ae256 100644 (file)
function Preload(p: PResource): Boolean;
function GetSourceStream(p: PResource): TStream;
+ 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;
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
FreeAndNil(FStream);
end;
FComment := '';
+ end;
+
+ procedure TZIPEditor.FreeWAD();
+ begin
+ Clear();
FLastError := DFWAD_NOERROR;
FVersion := 10;
end;
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;