X-Git-Url: https://deadsoftware.ru/gitweb?a=blobdiff_plain;f=src%2Fshared%2FWADEDITOR_dfzip.pas;h=3933330bff7ef979eaa81170718e324ca2716b06;hb=f7b837dfba6b036781a38fddbe957eb0478359b3;hp=c01fe7fa5bca8d7ebaa01d62a52cfb48467dc65c;hpb=54c1d58fb3e3b6b99b2ad73de6a9eb6509ef0bc4;p=d2df-editor.git

diff --git a/src/shared/WADEDITOR_dfzip.pas b/src/shared/WADEDITOR_dfzip.pas
index c01fe7f..3933330 100644
--- a/src/shared/WADEDITOR_dfzip.pas
+++ b/src/shared/WADEDITOR_dfzip.pas
@@ -6,13 +6,13 @@ unit WADEDITOR_dfzip;
 // - 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
-// - Expect UTF-8 or CP1251 encoded names
-// - ZIP64 not supported
-// - Encryption not supported
-// - Zero-length file names not supported
+// - Expects UTF-8 or CP1251 encoded names
+// - ZIP64 is not supported
+// - Encryption is not supported
+// - Zero-length file names are not supported
 // - CDR holds most actual data about file, LFH mostly ignored
 // - Attributes and extra data are ignored and not preserved
-// - Store and Deflate compression supported
+// - Supports STORE and DEFLATE compression methods
 
 interface
 
@@ -62,6 +62,8 @@ interface
         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;
@@ -457,16 +459,15 @@ implementation
     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
@@ -492,6 +493,11 @@ implementation
       FreeAndNil(FStream);
     end;
     FComment := '';
+  end;
+
+  procedure TZIPEditor.FreeWAD();
+  begin
+    Clear();
     FLastError := DFWAD_NOERROR;
     FVersion := 10;
   end;
@@ -877,7 +883,7 @@ implementation
                   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?)');
+                        raise Exception.Create('Compressed size ' + IntToStr(csize) + ' != Decompressed size ' + IntToStr(usize) + 'for STORE method (corrupted file?)');
                     ZIP_COMP_SHRUNK,
                     ZIP_COMP_REDUCE1,
                     ZIP_COMP_REDUCE2,
@@ -901,7 +907,7 @@ implementation
                     ZIP_COMP_PPMD:
                       ; // ok
                     ZIP_COMP_AE:
-                      raise Exception.Create('Encrypted archives not supported');
+                      raise Exception.Create('Encrypted archives are not supported');
                     otherwise
                       raise Exception.Create('Unknown compression method ' + IntToStr(comp));
                   end;
@@ -944,7 +950,7 @@ implementation
                   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) + ': UTF-8 Compatible  : ' + 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;
@@ -953,27 +959,27 @@ implementation
                   s.Seek(next, TSeekOrigin.soBeginning);
                 end
                 else
-                  raise Exception.Create('Empty files names not supported');
+                  raise Exception.Create('Empty files names are not supported');
               end
               else
-                raise Exception.Create('Splitted archives not supported');
+                raise Exception.Create('Split archives are not supported');
             end
             else
             begin
               FLastError := DFWAD_ERROR_WRONGVERSION;
-              raise Exception.Create('ZIP64 archives not supported');
+              raise Exception.Create('ZIP64 archives are not supported');
             end;
           end
           else
           begin
             FLastError := DFWAD_ERROR_READWAD;
-            raise Exception.Create('Patch archives not supported');
+            raise Exception.Create('Patch archives are not supported');
           end;
         end
         else
         begin
           FLastError := DFWAD_ERROR_READWAD;
-          raise Exception.Create('Encrypted archives not supported');
+          raise Exception.Create('Encrypted archives are not supported');
         end;
       end
       else
@@ -1072,7 +1078,7 @@ implementation
                   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) + ': UTF-8 Compatible  : ' + BoolToStr(utf8, True), MSG_NOTIFY);
                     e_WriteLog('EOCD  @' + IntToHex(mypos, 8) + ': Comment           : "' + FComment + '"', MSG_NOTIFY);
                   end;
                   i := 0;
@@ -1104,7 +1110,7 @@ implementation
         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;
@@ -1129,7 +1135,7 @@ implementation
         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
@@ -1169,7 +1175,7 @@ implementation
       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;
@@ -1354,7 +1360,7 @@ implementation
             end
             else
             begin
-              raise Exception.Create('No data source available (somethig very wrong)');
+              raise Exception.Create('No data source available (something very wrong)');
             end;
           end;
         end