Fixing #98 logic for LPWSTR, fixing test [Test_SUMMARY_INFO_READ_LPWS…

…TRING_VECTOR] for null terminator character suppression in User presentation,
ironfede · Aug 6, 2024 · cac87ec · cac87ec
1 parent 390dcb3
commit cac87ec
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 4 deletions.
diff --git a/sources/OpenMcdf.Extensions/OLEProperties/PropertyFactory.cs b/sources/OpenMcdf.Extensions/OLEProperties/PropertyFactory.cs
@@ -512,7 +512,8 @@ public VT_LPWSTR_Property(VTPropertyType vType, int codePage, bool isVariant) :
             public override string ReadScalarValue(System.IO.BinaryReader br)
             {
                 uint nChars = br.ReadUInt32();
-                data = br.ReadBytes((int)((nChars * 2) - 2));  //WChar- null terminator
+                data = br.ReadBytes((int)(((nChars-1) * 2)));  //WChar- null terminator
+                br.ReadBytes(2); // Skip null terminator
                 var result = Encoding.Unicode.GetString(data);
                 //result = result.Trim(new char[] { '\0' });
 

diff --git a/sources/Test/OpenMcdf.Extensions.Test/OLEPropertiesExtensionsTest.cs b/sources/Test/OpenMcdf.Extensions.Test/OLEPropertiesExtensionsTest.cs
@@ -460,9 +460,9 @@ public void Test_SUMMARY_INFO_READ_LPWSTRING_VECTOR()
 
                 var docPartsValues = docPartsProperty.Value as IEnumerable<string>;
                 Assert.AreEqual(3, docPartsValues.Count());
-                Assert.AreEqual("Sheet1\0", docPartsValues.ElementAt(0));
-                Assert.AreEqual("Sheet2\0", docPartsValues.ElementAt(1));
-                Assert.AreEqual("Sheet3\0", docPartsValues.ElementAt(2));
+                Assert.AreEqual("Sheet1", docPartsValues.ElementAt(0));
+                Assert.AreEqual("Sheet2", docPartsValues.ElementAt(1));
+                Assert.AreEqual("Sheet3", docPartsValues.ElementAt(2));
             }
         }