- Fixed TLKs being loaded and saved with wrong encodings

- Fixed bug that occured when editing multiple objects of the same type
Cjreek · Apr 3, 2023 · ae1e021 · ae1e021
1 parent a18dd24
commit ae1e021
Show file tree

Hide file tree

Showing 9 changed files with 54 additions and 17 deletions.
diff --git a/eos-edit/App.axaml.cs b/eos-edit/App.axaml.cs
@@ -12,6 +12,7 @@
 using Nwn.Tga;
 using System.IO;
 using System.Runtime.InteropServices;
+using System.Text;
 
 namespace Eos
 {
@@ -25,6 +26,7 @@ public override void Initialize()
 
         public override void OnFrameworkInitializationCompleted()
         {
+            Encoding.RegisterProvider(CodePagesEncodingProvider.Instance);
             if (ApplicationLifetime is IClassicDesktopStyleApplicationLifetime desktop)
             {
                 desktop.Startup += Desktop_Startup;

diff --git a/eos-edit/Views/MainWindow.axaml b/eos-edit/Views/MainWindow.axaml
@@ -18,7 +18,7 @@
         mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
         x:Class="Eos.Views.MainWindow" MinHeight="300" MinWidth="500"
         Height="700" Width="1100" Loaded="mainWindow_Loaded"
-        x:Name="mainWindow" Tag="Eos Toolset v0.63c" FontFamily="Segoe UI"
+        x:Name="mainWindow" Tag="Eos Toolset v0.63d" FontFamily="Segoe UI"
         Closing="mainWindow_Closing"
         Icon="/Assets/Icons/Eos.ico">
   <Window.Title>

diff --git a/eos-edit/eos-edit.csproj b/eos-edit/eos-edit.csproj
@@ -46,6 +46,7 @@
     <PackageReference Include="Avalonia.ReactiveUI" Version="11.0.999-cibuild0031415-beta" />
     <PackageReference Include="Avalonia.Themes.Simple" Version="11.0.999-cibuild0031415-beta" />
     <PackageReference Include="Avalonia.Xaml.Behaviors" Version="11.0.999-build20230226-01" />
+    <PackageReference Include="System.Text.Encoding.CodePages" Version="8.0.0-preview.2.23128.3" />
     <PackageReference Include="XamlNameReferenceGenerator" Version="1.6.1" />
   </ItemGroup>
   <ItemGroup>

diff --git a/eos/Models/Tables/CustomObject.cs b/eos/Models/Tables/CustomObject.cs
@@ -50,8 +50,9 @@ public CustomObject() : base()
 
         private void InstanceRepository_CollectionChanged(object? sender, NotifyCollectionChangedEventArgs e)
         {
-            if ((e.Action == NotifyCollectionChangedAction.Reset) || (e.Action == NotifyCollectionChangedAction.Move))
-                NotifyPropertyChanged(nameof(InstanceRepository));
+            // Suddenly works ??
+            //if ((e.Action == NotifyCollectionChangedAction.Reset) || (e.Action == NotifyCollectionChangedAction.Move))
+            //    NotifyPropertyChanged(nameof(InstanceRepository));
         }
 
         protected override void SetDefaultValues()

diff --git a/eos/Nwn/BinaryHelper.cs b/eos/Nwn/BinaryHelper.cs
@@ -51,9 +51,9 @@ public static String ReadString(BinaryReader stream, int length)
             return new String(stream.ReadChars(length)).Trim('\0');
         }
 
-        public static void WriteString(BinaryWriter stream, String data, bool writeNullbyte = true)
+        public static void WriteString(BinaryWriter stream, String data, Encoding encoding, bool writeNullbyte = true)
         {
-            stream.Write(data.ToCharArray());
+            stream.Write(encoding.GetBytes(data));
             if (writeNullbyte)
                 stream.Write('\0');
         }

diff --git a/eos/Nwn/Erf/ErfFile.cs b/eos/Nwn/Erf/ErfFile.cs
@@ -94,6 +94,20 @@ private class ErfResourceKey
         private Dictionary<(string, NWNResourceType), ErfResourceKey> resourceKeys = new Dictionary<(string, NWNResourceType), ErfResourceKey>();
         private List<ErfResource> resources = new List<ErfResource>();
 
+        private Dictionary<TLKLanguage, Encoding> languageEncodings = new Dictionary<TLKLanguage, Encoding>
+        {
+            { TLKLanguage.English, Encoding.GetEncoding(1252) },
+            { TLKLanguage.French, Encoding.GetEncoding(1252) },
+            { TLKLanguage.German, Encoding.GetEncoding(1252) },
+            { TLKLanguage.Italian, Encoding.GetEncoding(1252) },
+            { TLKLanguage.Spanish, Encoding.GetEncoding(1252) },
+            { TLKLanguage.Polish, Encoding.GetEncoding(1250) },
+            { TLKLanguage.Korean, Encoding.GetEncoding(949) },
+            { TLKLanguage.ChineseTraditional, Encoding.GetEncoding(950) },
+            { TLKLanguage.ChineseSimplified, Encoding.GetEncoding(936) },
+            { TLKLanguage.Japanese, Encoding.GetEncoding(932) },
+        };
+
         public int Count => resources.Count;
         public ErfResource this[int index] => resources[index];
 
@@ -180,7 +194,7 @@ public void Save(Stream stream, ErfType type = ErfType.HAK)
                     strElement.LanguageID = ((UInt32)lang) * 2;
                     strElement.StringSize = (UInt32)Description[lang].Text.Length + 1;
                     BinaryHelper.Write(writer, strElement);
-                    BinaryHelper.WriteString(writer, Description[lang].Text);
+                    BinaryHelper.WriteString(writer, Description[lang].Text, languageEncodings[lang]);
 
                     strSegmentSize += (UInt32)(Marshal.SizeOf<ErfStringElement>() + strElement.StringSize);
                     langCount++;
@@ -192,7 +206,7 @@ public void Save(Stream stream, ErfType type = ErfType.HAK)
                     strElement.LanguageID = ((UInt32)lang) * 2 + 1;
                     strElement.StringSize = (UInt32)Description[lang].TextF.Length + 1;
                     BinaryHelper.Write(writer, strElement);
-                    BinaryHelper.WriteString(writer, Description[lang].TextF);
+                    BinaryHelper.WriteString(writer, Description[lang].TextF, languageEncodings[lang]);
 
                     strSegmentSize += (UInt32)(Marshal.SizeOf<ErfStringElement>() + strElement.StringSize);
                     langCount++;

diff --git a/eos/Nwn/Ssf/SsfFile.cs b/eos/Nwn/Ssf/SsfFile.cs
@@ -64,7 +64,7 @@ public void Load(String filename)
 
         public void Load(Stream stream)
         {
-            var reader = new BinaryReader(stream, Encoding.Latin1);
+            var reader = new BinaryReader(stream, Encoding.GetEncoding(1252));
             var header = BinaryHelper.Read<SsfHeader>(reader);
 
             var offsetArray = new int[header.EntryCount];

diff --git a/eos/Nwn/Tlk/TlkFile.cs b/eos/Nwn/Tlk/TlkFile.cs
@@ -1,4 +1,5 @@
-using System;
+using Eos.Services;
+using System;
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
@@ -49,6 +50,19 @@ internal class TlkFile
 
         private Dictionary<int, String> cache = new Dictionary<int, string>();
         private List<String> strings = new List<string>();
+        private Dictionary<TLKLanguage, Encoding> languageEncodings = new Dictionary<TLKLanguage, Encoding>
+        {
+            { TLKLanguage.English, Encoding.GetEncoding(1252) },
+            { TLKLanguage.French, Encoding.GetEncoding(1252) },
+            { TLKLanguage.German, Encoding.GetEncoding(1252) },
+            { TLKLanguage.Italian, Encoding.GetEncoding(1252) },
+            { TLKLanguage.Spanish, Encoding.GetEncoding(1252) },
+            { TLKLanguage.Polish, Encoding.GetEncoding(1250) },
+            { TLKLanguage.Korean, Encoding.GetEncoding(949) },
+            { TLKLanguage.ChineseTraditional, Encoding.GetEncoding(950) },
+            { TLKLanguage.ChineseSimplified, Encoding.GetEncoding(936) },
+            { TLKLanguage.Japanese, Encoding.GetEncoding(932) },
+        };
 
         public void New(TLKLanguage language)
         {
@@ -61,10 +75,14 @@ public void New(TLKLanguage language)
 
         public void Load(String tlkFile, bool writeable = false)
         {
-            fileStream = new FileStream(tlkFile, FileMode.Open, FileAccess.Read);
-            reader = new BinaryReader(fileStream, Encoding.Latin1);
-            header = BinaryHelper.Read<TlkHeader>(reader);
+            using (fileStream = new FileStream(tlkFile, FileMode.Open, FileAccess.Read))
+            {
+                reader = new BinaryReader(fileStream, Encoding.Default);
+                header = BinaryHelper.Read<TlkHeader>(reader);
+            };
 
+            fileStream = new FileStream(tlkFile, FileMode.Open, FileAccess.Read);
+            reader = new BinaryReader(fileStream, languageEncodings[header.LanguageId]);
             if (writeable)
             {
                 int lastNonNullIndex = -1;
@@ -74,7 +92,7 @@ public void Load(String tlkFile, bool writeable = false)
                         lastNonNullIndex = i;
                 }
 
-                for (int i=0; i <= lastNonNullIndex; i++)
+                for (int i = 0; i <= lastNonNullIndex; i++)
                 {
                     strings.Add(GetString(i));
                 }
@@ -154,15 +172,17 @@ public void Save(Stream stream)
                 strEntry.VolumeVariance = 0;
                 strEntry.PitchVariance = 0;
                 strEntry.OffsetToString = offset;
-                strEntry.StringSize = (UInt32)strings[i].Length;
+                strEntry.StringSize = (UInt32)languageEncodings[header.LanguageId].GetByteCount(strings[i]); //(UInt32)strings[i].Length;
                 strEntry.SoundLength = 0;
                 BinaryHelper.Write(writer, strEntry);
 
                 offset += strEntry.StringSize;
             }
 
             for (int i = 0; i < strings.Count; i++)
-                BinaryHelper.WriteString(writer, strings[i], false);
+            {
+                BinaryHelper.WriteString(writer, strings[i], languageEncodings[header.LanguageId], false);
+            }
         }
 
         public void Save(String filename)

diff --git a/eos/Repositories/Repository.cs b/eos/Repositories/Repository.cs
@@ -83,8 +83,7 @@ protected void RaiseCollectionChanged(NotifyCollectionChangedEventArgs e)
 
         private void Item_PropertyChanged(object? sender, PropertyChangedEventArgs e)
         {
-            RaiseCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Move, sender, 0, 0)); // 0 -> 0 Dummy. Works
-            //RaiseCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
+            RaiseCollectionChanged(new NotifyCollectionChangedEventArgs(NotifyCollectionChangedAction.Reset));
         }
 
         protected virtual void Changed()