Merge pull request #235 from dotnetprojects/fixes

jogibear9988 · web-flow · commit 575168647754 · 2025-06-06T23:08:48.000+02:00
Fixes
diff --git a/LibNoDaveConnectionLibrary/General/ZipHelper.cs b/LibNoDaveConnectionLibrary/General/ZipHelper.cs
@@ -7,7 +7,7 @@
 #endif
 
 namespace DotNetSiemensPLCToolBoxLibrary.General
-{    
+{
     public class ZipHelper
     {
 #if SHARPZIPLIB
@@ -98,9 +98,9 @@ public ZipHelper(string file)
                     this._zipFile = null;
                     this._zipFile = new ZipFile(file);
                 }
-                catch(Exception)
+                catch (Exception)
                 { }
-            }               
+            }
 #endif
         }
 
@@ -109,7 +109,7 @@ private ZipHelper(Stream file)
 #if SHARPZIPLIB
             if (file != null)
             {
-                this._zipFile = new ZipFile(file);                
+                this._zipFile = new ZipFile(file);
             }
 #endif
         }
@@ -118,7 +118,7 @@ public void Close()
         {
 #if SHARPZIPLIB
             if (_zipFile != null)
-            {                               
+            {
                 _zipFile.Close();
                 _zipFile = null;
             }
@@ -132,7 +132,7 @@ public Stream GetReadStream(string file)
 #if SHARPZIPLIB
             if (_zipFile == null)
             {
-#endif               
+#endif
                 return new FileStream(file, FileMode.Open, FileAccess.Read, System.IO.FileShare.ReadWrite);
 #if SHARPZIPLIB
             }
@@ -141,15 +141,15 @@ public Stream GetReadStream(string file)
                 ZipFile zf = (ZipFile)_zipFile;
                 int fileEntry = zf.FindEntry(file.Replace("\\", "/"), true);
                 return zf.GetInputStream(fileEntry);
-                
+
             }
 #endif
         }
 
         public bool IsZipped()
         {
 #if SHARPZIPLIB
-            if (_zipFile!=null)
+            if (_zipFile != null)
                 return true;
 #endif
             return false;
@@ -202,7 +202,7 @@ public void WriteBackStream(string file, Stream strm)
             if (_zipFile == null)
             {
 #endif
-             strm.Close();   
+                strm.Close();
 #if SHARPZIPLIB
             }
             else
@@ -212,9 +212,9 @@ public void WriteBackStream(string file, Stream strm)
 
                 int nr = _zipFile.FindEntry(file.Replace("\\", "/"), true);
                 _zipFile.Delete(_zipFile[nr]);
-                
+
                 CustomStaticDataSource sds = new CustomStaticDataSource();
-	            sds.SetStream(strm);
+                sds.SetStream(strm);
                 _zipFile.Add(sds, file.Replace("\\", "/"));
                 _zipFile.CommitUpdate();
                 _zipFile.Close();
@@ -231,7 +231,7 @@ public void WriteBackStream(string file, Stream strm)
 #endif
         }
 
-       
+
         public long GetStreamLength(string file, Stream strm)
         {
 #if SHARPZIPLIB
@@ -262,11 +262,11 @@ public bool FileExists(string file)
             {
                 ZipFile zf = (ZipFile)_zipFile;
                 //return zf.ContainsEntry(file.Replace("\\", "/"));
-                int fileEntry = zf.FindEntry(file.Replace("\\","/"), true);
-                return fileEntry >= 0;                    
+                int fileEntry = zf.FindEntry(file.Replace("\\", "/"), true);
+                return fileEntry >= 0;
             }
 #endif
         }
-        
+
     }
 }
diff --git a/LibNoDaveConnectionLibrary/Projectfiles/Step5Project.cs b/LibNoDaveConnectionLibrary/Projectfiles/Step5Project.cs
@@ -31,7 +31,11 @@ public Step5Project(string filename, bool showDeleted)
                 this._ziphelper = new ZipHelper(filename);
                 _projectfilename = _ziphelper.GetFirstZipEntryWithEnding(".s5d");
                 if (string.IsNullOrEmpty(_projectfilename))
-                    throw new Exception("Zip-File contains no valid Step5 Project !");                
+                    throw new Exception("Zip-File contains no valid Step5 Project !");
+            }
+            else
+            {
+                this._ziphelper = new ZipHelper(filename);
             }
 
             ProjectFile = filename;
@@ -43,11 +47,11 @@ internal Step5Project(ZipHelper _ziphelper, string filename, bool showDeleted)
         {
             _showDeleted = showDeleted;
             this._ziphelper = _ziphelper;
-            
+
             _projectfilename = _ziphelper.GetFirstZipEntryWithEnding(".s5d");
-                if (string.IsNullOrEmpty(_projectfilename))
-                    throw new Exception("Zip-File contains no valid Step5 Project !");
-           
+            if (string.IsNullOrEmpty(_projectfilename))
+                throw new Exception("Zip-File contains no valid Step5 Project !");
+
             ProjectFile = filename;
 
             LoadProject();
@@ -76,10 +80,10 @@ protected override void LoadProject()
             ProjectName = System.Text.Encoding.UTF7.GetString(s5ProjectByteArray, 0x08, 8);
 
             //Read the Project Size
-            Size = s5ProjectByteArray[0x14] + s5ProjectByteArray[0x15]*0x100;
+            Size = s5ProjectByteArray[0x14] + s5ProjectByteArray[0x15] * 0x100;
 
             //Create the main Project Folder
-            ProjectStructure = new Step5ProgrammFolder() {Project = this, Name = this.ToString()};
+            ProjectStructure = new Step5ProgrammFolder() { Project = this, Name = this.ToString() };
             _allFolders.Add(ProjectStructure);
 
             //int startpos = s5ProjectByteArray[0x12] * 0x80;
@@ -90,12 +94,12 @@ protected override void LoadProject()
 
             for (int j = 0; j < anz_sections; j++)
             {
-                int pos = 0x44 + j*19;
-                sections_lst.Add(s5ProjectByteArray[pos + 15] + s5ProjectByteArray[pos + 16]*0x100);
+                int pos = 0x44 + j * 19;
+                sections_lst.Add(s5ProjectByteArray[pos + 15] + s5ProjectByteArray[pos + 16] * 0x100);
             }
 
 
-            Step5BlocksFolder blkFld = new Step5BlocksFolder() {Name = "Blocks", Project = this, Parent = ProjectStructure};
+            Step5BlocksFolder blkFld = new Step5BlocksFolder() { Name = "Blocks", Project = this, Parent = ProjectStructure };
             BlocksFolder = blkFld;
             ProjectStructure.SubItems.Add(blkFld);
 
@@ -107,7 +111,7 @@ protected override void LoadProject()
 
             foreach (int secpos in sections_lst)
             {
-                int section_start = secpos*0x80;
+                int section_start = secpos * 0x80;
                 /* The len for a Section is not always calculated right, so if the Section does not begin with the filename add 0x80 until it works */
                 /* But I don't know why it's wrong */
 
@@ -136,7 +140,7 @@ protected override void LoadProject()
                 for (int j = 0; j < anzbst; j++)
                 {
                     byte[] tmp = new byte[15];
-                    Array.Copy(s5ProjectByteArray, section_start + 68 + j*15, tmp, 0, 15);
+                    Array.Copy(s5ProjectByteArray, section_start + 68 + j * 15, tmp, 0, 15);
                     bstHeaders.Add(tmp);
                 }
 
@@ -154,7 +158,7 @@ protected override void LoadProject()
                 */
 
                 //Don't know wich Information is in the Section Header!
-                int section_header_size = s5ProjectByteArray[section_start + 18]*0x80;
+                int section_header_size = s5ProjectByteArray[section_start + 18] * 0x80;
 
 
 
@@ -166,7 +170,7 @@ protected override void LoadProject()
                     //    n += 0x80;
 
                     while (akanz < anzbst && n + 1 < s5ProjectByteArray.Length)
-                        //n < section_start + section_size)                       
+                    //n < section_start + section_size)                       
                     {
                         akanz++;
                         int len = 0;
@@ -294,23 +298,23 @@ protected override void LoadProject()
             if (_showDeleted)
             {
                 //Read also the deleted Blocks, that means, don't use the Section Headers ...
-                int akpos = s5ProjectByteArray[0x12]*0x80;
+                int akpos = s5ProjectByteArray[0x12] * 0x80;
 
                 while (akpos <= s5ProjectByteArray.Length - 0x80)
                 {
                     while (!IsCurrentPosABlockStart(s5ProjectByteArray, akpos) &&
                            akpos <= s5ProjectByteArray.Length - 0x80)
                         akpos += 0x80;
-                    
+
                     if (akpos <= s5ProjectByteArray.Length - 0x80)
                     {
                         bool blkExists = ByteAddressOFExistingBlocks.Contains(akpos);
-                        var tmp=AddBlockInfo(s5ProjectByteArray, ref akpos, blkFld, null);
+                        var tmp = AddBlockInfo(s5ProjectByteArray, ref akpos, blkFld, null);
                         if (!blkExists)
                         {
                             tmp.Deleted = true;
                             blkFld.step5BlocksinfoList.Add(tmp);
-                        }                        
+                        }
                     }
                 }
             }
@@ -319,7 +323,7 @@ protected override void LoadProject()
             {
                 Stream symTabStream = _ziphelper.GetReadStream(_projectfilename.ToLower().Replace("st.s5d", "z0.seq"));
 
-                SymbolTable symtab=new SymbolTable();
+                SymbolTable symtab = new SymbolTable();
                 symtab.LoadSymboltable(symTabStream);
                 symTabStream.Close();
                 symtab.Parent = ProjectStructure;
@@ -328,7 +332,7 @@ protected override void LoadProject()
                 _allFolders.Add(symtab);
             }
 
-            var refFld = new ReferenceData((Step5ProgrammFolder) ProjectStructure, this);
+            var refFld = new ReferenceData((Step5ProgrammFolder)ProjectStructure, this);
             ProjectStructure.SubItems.Add(refFld); // { Parent = ProjectStructure, Project = this });
             _allFolders.Add(refFld);
 
@@ -470,7 +474,7 @@ public override string ToString()
                 retVal += "(zipped)";
             if (_showDeleted == true)
                 retVal += " (show deleted)";
-            return retVal;            
+            return retVal;
         }
-    }    
+    }
 }

Original file line number	Diff line number	Diff line change
`@@ -7,7 +7,7 @@`
`7`	`7`	`#endif`
`8`	`8`
`9`	`9`	`namespace DotNetSiemensPLCToolBoxLibrary.General`
`10`		`-{`
	`10`	`+{`
`11`	`11`	`public class ZipHelper`
`12`	`12`	`{`
`13`	`13`	`#if SHARPZIPLIB`
`@@ -98,9 +98,9 @@ public ZipHelper(string file)`
`98`	`98`	`this._zipFile = null;`
`99`	`99`	`this._zipFile = new ZipFile(file);`
`100`	`100`	`}`
`101`		`- catch(Exception)`
	`101`	`+ catch (Exception)`
`102`	`102`	`{ }`
`103`		`- }`
	`103`	`+ }`
`104`	`104`	`#endif`
`105`	`105`	`}`
`106`	`106`
`@@ -109,7 +109,7 @@ private ZipHelper(Stream file)`
`109`	`109`	`#if SHARPZIPLIB`
`110`	`110`	`if (file != null)`
`111`	`111`	`{`
`112`		`- this._zipFile = new ZipFile(file);`
	`112`	`+ this._zipFile = new ZipFile(file);`
`113`	`113`	`}`
`114`	`114`	`#endif`
`115`	`115`	`}`
`@@ -118,7 +118,7 @@ public void Close()`
`118`	`118`	`{`
`119`	`119`	`#if SHARPZIPLIB`
`120`	`120`	`if (_zipFile != null)`
`121`		`- {`
	`121`	`+ {`
`122`	`122`	`_zipFile.Close();`
`123`	`123`	`_zipFile = null;`
`124`	`124`	`}`
`@@ -132,7 +132,7 @@ public Stream GetReadStream(string file)`
`132`	`132`	`#if SHARPZIPLIB`
`133`	`133`	`if (_zipFile == null)`
`134`	`134`	`{`
`135`		`-#endif`
	`135`	`+#endif`
`136`	`136`	`return new FileStream(file, FileMode.Open, FileAccess.Read, System.IO.FileShare.ReadWrite);`
`137`	`137`	`#if SHARPZIPLIB`
`138`	`138`	`}`
`@@ -141,15 +141,15 @@ public Stream GetReadStream(string file)`
`141`	`141`	`ZipFile zf = (ZipFile)_zipFile;`
`142`	`142`	`int fileEntry = zf.FindEntry(file.Replace("\\", "/"), true);`
`143`	`143`	`return zf.GetInputStream(fileEntry);`
`144`		`-`
	`144`	`+`
`145`	`145`	`}`
`146`	`146`	`#endif`
`147`	`147`	`}`
`148`	`148`
`149`	`149`	`public bool IsZipped()`
`150`	`150`	`{`
`151`	`151`	`#if SHARPZIPLIB`
`152`		`- if (_zipFile!=null)`
	`152`	`+ if (_zipFile != null)`
`153`	`153`	`return true;`
`154`	`154`	`#endif`
`155`	`155`	`return false;`
`@@ -202,7 +202,7 @@ public void WriteBackStream(string file, Stream strm)`
`202`	`202`	`if (_zipFile == null)`
`203`	`203`	`{`
`204`	`204`	`#endif`
`205`		`- strm.Close();`
	`205`	`+ strm.Close();`
`206`	`206`	`#if SHARPZIPLIB`
`207`	`207`	`}`
`208`	`208`	`else`
`@@ -212,9 +212,9 @@ public void WriteBackStream(string file, Stream strm)`
`212`	`212`
`213`	`213`	`int nr = _zipFile.FindEntry(file.Replace("\\", "/"), true);`
`214`	`214`	`_zipFile.Delete(_zipFile[nr]);`
`215`		`-`
	`215`	`+`
`216`	`216`	`CustomStaticDataSource sds = new CustomStaticDataSource();`
`217`		`- sds.SetStream(strm);`
	`217`	`+ sds.SetStream(strm);`
`218`	`218`	`_zipFile.Add(sds, file.Replace("\\", "/"));`
`219`	`219`	`_zipFile.CommitUpdate();`
`220`	`220`	`_zipFile.Close();`
`@@ -231,7 +231,7 @@ public void WriteBackStream(string file, Stream strm)`
`231`	`231`	`#endif`
`232`	`232`	`}`
`233`	`233`
`234`		`-`
	`234`	`+`
`235`	`235`	`public long GetStreamLength(string file, Stream strm)`
`236`	`236`	`{`
`237`	`237`	`#if SHARPZIPLIB`
`@@ -262,11 +262,11 @@ public bool FileExists(string file)`
`262`	`262`	`{`
`263`	`263`	`ZipFile zf = (ZipFile)_zipFile;`
`264`	`264`	`//return zf.ContainsEntry(file.Replace("\\", "/"));`
`265`		`- int fileEntry = zf.FindEntry(file.Replace("\\","/"), true);`
`266`		`- return fileEntry >= 0;`
	`265`	`+ int fileEntry = zf.FindEntry(file.Replace("\\", "/"), true);`
	`266`	`+ return fileEntry >= 0;`
`267`	`267`	`}`
`268`	`268`	`#endif`
`269`	`269`	`}`
`270`		`-`
	`270`	`+`
`271`	`271`	`}`
`272`	`272`	`}`