From 3344ef7e4e39edb8e217c8181fbb5ece98bde4f0 Mon Sep 17 00:00:00 2001
From: Richard Webb <richard.webb@helpsystems.com>
Date: Wed, 21 Feb 2024 12:07:58 +0000
Subject: [PATCH] When creating a OLEPropertiesContainer for the
 UserDefinedPropeties, use the code page from PropertySet1 instead of the one
 from the parent section

---
 .../OLEProperties/OLEPropertiesContainer.cs   |   2 +-
 .../OLEPropertiesExtensionsTest.cs            |  38 ++++++++++++++++++
 .../Test/TestFiles/winUnicodeDictionary.doc   | Bin 0 -> 26624 bytes
 3 files changed, 39 insertions(+), 1 deletion(-)
 create mode 100644 sources/Test/TestFiles/winUnicodeDictionary.doc

diff --git a/sources/OpenMcdf.Extensions/OLEProperties/OLEPropertiesContainer.cs b/sources/OpenMcdf.Extensions/OLEProperties/OLEPropertiesContainer.cs
index 9c49ce0b..42afbc1e 100644
--- a/sources/OpenMcdf.Extensions/OLEProperties/OLEPropertiesContainer.cs
+++ b/sources/OpenMcdf.Extensions/OLEProperties/OLEPropertiesContainer.cs
@@ -131,7 +131,7 @@ internal OLEPropertiesContainer(CFStream cfStream)
 
             if (pStream.NumPropertySets == 2)
             {
-                UserDefinedProperties = new OLEPropertiesContainer(this.Context.CodePage, ContainerType.UserDefinedProperties);
+                UserDefinedProperties = new OLEPropertiesContainer(pStream.PropertySet1.PropertyContext.CodePage, ContainerType.UserDefinedProperties);
                 this.HasUserDefinedProperties = true;
 
                 UserDefinedProperties.ContainerType = ContainerType.UserDefinedProperties;
diff --git a/sources/Test/OpenMcdf.Extensions.Test/OLEPropertiesExtensionsTest.cs b/sources/Test/OpenMcdf.Extensions.Test/OLEPropertiesExtensionsTest.cs
index 93d28931..cb2a5e5b 100644
--- a/sources/Test/OpenMcdf.Extensions.Test/OLEPropertiesExtensionsTest.cs
+++ b/sources/Test/OpenMcdf.Extensions.Test/OLEPropertiesExtensionsTest.cs
@@ -333,5 +333,43 @@ public void Test_SUMMARY_INFO_MODIFY_LPWSTRING()
             }
         }
 
+        // winUnicodeDictionary.doc contains a UserProperties section with the CP_WINUNICODE codepage, and LPWSTR string properties
+        [TestMethod]
+        public void Test_Read_Unicode_User_Properties_Dictionary()
+        {
+            using (CompoundFile cf = new CompoundFile("winUnicodeDictionary.doc"))
+            {
+                var dsiStream = cf.RootStorage.GetStream("\u0005DocumentSummaryInformation");
+                var co = dsiStream.AsOLEPropertiesContainer();
+                var userProps = co.UserDefinedProperties;
+
+                // CodePage should be CP_WINUNICODE (1200) 
+                Assert.AreEqual(1200, userProps.Context.CodePage);
+
+                // There should be 5 property names present, and 6 properties (the properties include the code page)
+                Assert.AreEqual(5, userProps.PropertyNames.Count);
+                Assert.AreEqual(6, userProps.Properties.Count());
+                
+                // Check for expected names and values
+                var propArray = userProps.Properties.ToArray();
+                
+                // CodePage prop
+                Assert.AreEqual(1u, propArray[0].PropertyIdentifier);
+                Assert.AreEqual("0x00000001", propArray[0].PropertyName);
+                Assert.AreEqual((short)1200, propArray[0].Value);
+
+                // String properties
+                Assert.AreEqual("A\0", propArray[1].PropertyName);
+                Assert.AreEqual("\0", propArray[1].Value);
+                Assert.AreEqual("AB\0", propArray[2].PropertyName);
+                Assert.AreEqual("X\0", propArray[2].Value);
+                Assert.AreEqual("ABC\0", propArray[3].PropertyName);
+                Assert.AreEqual("XY\0", propArray[3].Value);
+                Assert.AreEqual("ABCD\0", propArray[4].PropertyName);
+                Assert.AreEqual("XYZ\0", propArray[4].Value);
+                Assert.AreEqual("ABCDE\0", propArray[5].PropertyName);
+                Assert.AreEqual("XYZ!\0", propArray[5].Value);
+            }
+        }
     }
 }
diff --git a/sources/Test/TestFiles/winUnicodeDictionary.doc b/sources/Test/TestFiles/winUnicodeDictionary.doc
new file mode 100644
index 0000000000000000000000000000000000000000..2ba5153c78913c14c548d70d188ceae510d70845
GIT binary patch
literal 26624
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
T%*mS(KZgH#H>Pv{4-ohl)RpUi

literal 0
HcmV?d00001