Fix Fixed Length CString bug

marcussacana · Dec 26, 2021 · 21cecd4 · 21cecd4
1 parent caed27a
commit 21cecd4
Show file tree

Hide file tree

Showing 5 changed files with 7 additions and 7 deletions.
diff --git a/StringReloads/Engine/String/CString.cs b/StringReloads/Engine/String/CString.cs
@@ -23,8 +23,8 @@ private CString(byte* Ptr) : base(Ptr) { }
 
         public static implicit operator string(CString Str)
         {
-            var Len = Str.Count();
-            return new string(Str.Address, 0, Len, Str.ReadEncoding);
+            var Len =  Str.FixedLength ?? Str.Count();
+            return new string(Str.Address, 0, (int)Len, Str.ReadEncoding);
         }
 
         public static implicit operator CString(string Content)

diff --git a/StringReloads/Engine/String/StringBufferA.cs b/StringReloads/Engine/String/StringBufferA.cs
@@ -6,7 +6,7 @@ namespace StringReloads.Engine.String
 {
     public unsafe abstract class StringBufferA : IEnumerable<byte>
     {
-        public uint? FixedLength = null;
+        public long? FixedLength = null;
         public sbyte* Address => (sbyte*)Ptr;
         public IEnumerator<byte> GetEnumerator()
         {

diff --git a/StringReloads/Engine/String/StringBufferW.cs b/StringReloads/Engine/String/StringBufferW.cs
@@ -6,7 +6,7 @@ namespace StringReloads.Engine.String
 {
     public unsafe abstract class StringBufferW : IEnumerable<byte>
     {
-        public uint? FixedLength = null;
+        public long? FixedLength = null;
         public sbyte* Address => (sbyte*)Ptr;
         public IEnumerator<byte> GetEnumerator()
         {

diff --git a/StringReloads/Engine/String/WCString.cs b/StringReloads/Engine/String/WCString.cs
@@ -20,8 +20,8 @@ private WCString(byte* Ptr) : base(Ptr) { }
 
         public static implicit operator string(WCString Str)
         {
-            var Len = Str.Count();
-            return new string(Str.Address, 0, Len, Encoding.Unicode);
+            var Len = Str.FixedLength ?? Str.Count();
+            return new string(Str.Address, 0, (int)Len, Encoding.Unicode);
         }
 
         public static implicit operator WCString(string Content)

diff --git a/StringReloads/Hook/Win32/TextOutA.cs b/StringReloads/Hook/Win32/TextOutA.cs
@@ -22,7 +22,7 @@ public override void Initialize()
         bool hTextOut(void* dc, int xStart, int yStart, byte* pStr, int strLen)
         {
             CString OriStr = pStr;
-            OriStr.FixedLength = (uint)strLen;
+            OriStr.FixedLength = strLen;
 
             WCString InStr = EntryPoint.ProcessW((WCString)(string)OriStr);