Merge pull request #68 from Xanfre/master

Use the encoding for the current OEM code page when reading zips
FenPhoenix · Feb 21, 2021 · cf8dd2f · cf8dd2f
2 parents 9f44ff1 + fa83716
commit cf8dd2f
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 5 deletions.
diff --git a/AngelLoader/FMBackupAndRestore.cs b/AngelLoader/FMBackupAndRestore.cs
@@ -1,5 +1,6 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
@@ -278,7 +279,7 @@ void AddBakFilesFrom(string path)
                 string fmInstalledPath = Path.Combine(thisFMInstallsBasePath, fm.InstalledDir);
 
                 using (var archive = new ZipArchive(new FileStream(fileToUse.Name, FileMode.Open, FileAccess.Read),
-                    ZipArchiveMode.Read, leaveOpen: false))
+                    ZipArchiveMode.Read, leaveOpen: false, Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage)))
                 {
                     int filesCount = archive.Entries.Count;
                     if (fileToUse.DarkLoader)
@@ -490,7 +491,7 @@ private static (List<string> ChangedList, List<string> AddedList, List<string> F
             if (fmIsZip)
             {
                 using var archive = new ZipArchive(new FileStream(fmArchivePath, FileMode.Open, FileAccess.Read),
-                    ZipArchiveMode.Read, leaveOpen: false);
+                    ZipArchiveMode.Read, leaveOpen: false, Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage));
 
                 for (int i = 0; i < archive.Entries.Count; i++)
                 {

diff --git a/AngelLoader/FMCache.cs b/AngelLoader/FMCache.cs
@@ -1,8 +1,10 @@
 using System;
 using System.Collections.Generic;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Linq;
+using System.Text;
 using System.Threading.Tasks;
 using AngelLoader.DataClasses;
 using AngelLoader.WinAPI;
@@ -214,7 +216,8 @@ private static void ExtractHTMLRefFiles(string fmArchivePath, string fmCachePath
             var htmlRefFiles = new List<NameAndIndex>();
 
             using var archive = new ZipArchive(new FileStream(fmArchivePath, FileMode.Open, FileAccess.Read),
-                ZipArchiveMode.Read, leaveOpen: false);
+                ZipArchiveMode.Read, leaveOpen: false,
+                Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage));
 
             foreach (string f in Directory.GetFiles(fmCachePath, "*", SearchOption.AllDirectories))
             {
@@ -300,7 +303,8 @@ private static void ZipExtract(string fmArchivePath, string fmCachePath, List<st
             try
             {
                 using var archive = new ZipArchive(new FileStream(fmArchivePath, FileMode.Open, FileAccess.Read),
-                    ZipArchiveMode.Read, leaveOpen: false);
+                    ZipArchiveMode.Read, leaveOpen: false,
+                    Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage));
 
                 for (int i = 0; i < archive.Entries.Count; i++)
                 {

diff --git a/AngelLoader/FMInstallAndPlay.cs b/AngelLoader/FMInstallAndPlay.cs
@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Diagnostics;
+using System.Globalization;
 using System.IO;
 using System.IO.Compression;
 using System.Text;
@@ -606,7 +607,8 @@ private static bool InstallFMZip(string fmArchivePath, string fmInstalledPath)
                 Directory.CreateDirectory(fmInstalledPath);
 
                 using var archive = new ZipArchive(new FileStream(fmArchivePath, FileMode.Open, FileAccess.Read),
-                    ZipArchiveMode.Read, leaveOpen: false);
+                    ZipArchiveMode.Read, leaveOpen: false,
+                    Encoding.GetEncoding(CultureInfo.CurrentCulture.TextInfo.OEMCodePage));
 
                 int filesCount = archive.Entries.Count;
                 for (int i = 0; i < filesCount; i++)