From 626a3d60e5bd00338c37f7f65bd9a62e3786b632 Mon Sep 17 00:00:00 2001
From: vwangjinpeng <vwangjinpeng@163.com>
Date: Wed, 18 Oct 2023 09:52:32 +0800
Subject: [PATCH 1/3] MS-FSSHTTPB-20231018

---
 FSSHTTPWOPIInspector/Source/Parsers/FSSHTTPB.cs | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/FSSHTTPWOPIInspector/Source/Parsers/FSSHTTPB.cs b/FSSHTTPWOPIInspector/Source/Parsers/FSSHTTPB.cs
index 993d595..a57a953 100644
--- a/FSSHTTPWOPIInspector/Source/Parsers/FSSHTTPB.cs
+++ b/FSSHTTPWOPIInspector/Source/Parsers/FSSHTTPB.cs
@@ -431,9 +431,9 @@ public override void Parse(Stream s)
             if (this.Count.GetUint(Count) > 0)
             {
                 ulong tempCount = this.Count.GetUint(Count);
-                StringItem tempGuid = new StringItem();
                 do
                 {
+                    StringItem tempGuid = new StringItem();
                     tempGuid.Parse(s);
                     tempContent.Add(tempGuid);
                     tempCount--;
@@ -3545,6 +3545,8 @@ public class PutChangesRequest : BaseStructure
         [BitAttribute(1)]
         public byte E;
         [BitAttribute(1)]
+        public byte F;
+        [BitAttribute(1)]
         public byte G;
         [BitAttribute(1)]
         public byte H;
@@ -3575,6 +3577,7 @@ public override void Parse(Stream s)
             this.C = (byte)GetBits(tempByte, 2, 1);
             this.D = (byte)GetBits(tempByte, 3, 1);
             this.E = (byte)GetBits(tempByte, 4, 1);
+            this.F = (byte)GetBits(tempByte, 5, 1);
             this.G = (byte)GetBits(tempByte, 6, 1);
             this.H = (byte)GetBits(tempByte, 7, 1);
 

From aa6d22140111dd4b75f7dae5c984658154e28c71 Mon Sep 17 00:00:00 2001
From: xian-rong <v-xianyang@microsoft.com>
Date: Tue, 9 Jul 2024 10:49:54 +0800
Subject: [PATCH 2/3] Agreement on MS-OXPROPS PidTagClientActivelyEditingUntil
 structure has been added in the 20240416 version

Agreement on MS-OXPROPS PidTagClientActivelyEditingUntil structure has been added in the 20240416 version.
---
 MAPIInspector/Source/Parsers/MSOXPROPS.cs | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/MAPIInspector/Source/Parsers/MSOXPROPS.cs b/MAPIInspector/Source/Parsers/MSOXPROPS.cs
index bfd5bbe..0f55be4 100644
--- a/MAPIInspector/Source/Parsers/MSOXPROPS.cs
+++ b/MAPIInspector/Source/Parsers/MSOXPROPS.cs
@@ -658,6 +658,11 @@ public enum PidTagPropertyEnum : ushort
         /// </summary>
         PidTagClientActions = 0x6645,
 
+        /// <summary>
+        /// Specifies the date and time, in UTC, until which the client expects to be actively editing the object.
+        /// </summary>
+        PidTagClientActivelyEditingUntil = 0x3700,
+
         /// <summary>
         /// Contains the current time, in UTC, when the email message is submitted.
         /// </summary>

From 6e0045c9ed2cd131a469bdb408f54593a3782e17 Mon Sep 17 00:00:00 2001
From: Xianrong Yang <v-xianyang@microsoft.com>
Date: Wed, 25 Sep 2024 11:24:18 +0800
Subject: [PATCH 3/3] Resolve warning issues

---
 .../WOPIautomation/WOPIautomation/App.config  | 54 +++++++++----------
 .../WOPIautomation/WOPIautomation.csproj      |  2 +-
 2 files changed, 28 insertions(+), 28 deletions(-)

diff --git a/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/App.config b/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/App.config
index f6945e4..96b90ba 100644
--- a/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/App.config
+++ b/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/App.config
@@ -3,45 +3,45 @@
   <!-- Note: Property values are case-insensitive unless otherwise specified.-->
   <appSettings>
     <!-- The browser used to access the site. The value should be one of following: IE32, IE64, Chrome, Firefox.-->
-    <add key="Browser" value="ie32" />
-    <add key="UserName" value="contoso\user1"/>
-    <add key="Password" value="XXXXXXXX"/>
-    <add key="OtherUserName" value="contoso\user2"/>
-    <add key="OtherPassword" value="XXXXXXXX"/>
-    <add key="BaseAddress" value="http://sut02" />
-    <add key="DocumentAddress" value="http://sut02/Shared%20Documents/Forms/AllItems.aspx" />
-    <add key="Excel" value="..\..\..\Resource\Excel.xlsx" />
-    <add key="Word" value="..\..\..\Resource\Doc.docx" />
-    <add key="OneWithFileData" value="..\..\..\Resource\OneWithFileData.one" />
-    <add key="OneWithoutFileData" value="..\..\..\Resource\OneWithoutFileData.one" />
-    <add key="NotebookTableOfContents" value="..\..\..\Resource\Open Notebook.onetoc2" />
-    <add key="OneEncryption" value="..\..\..\Resource\Encryption.one" />
+    <add key="Browser" value="ie32"/>
+    <add key="UserName" value=""/>
+    <add key="Password" value=""/>
+    <add key="OtherUserName" value=""/>
+    <add key="OtherPassword" value=""/>
+    <add key="BaseAddress" value="http://sut02"/>
+    <add key="DocumentAddress" value="http://sut02/Shared%20Documents/Forms/AllItems.aspx"/>
+    <add key="Excel" value="..\..\..\Resource\Excel.xlsx"/>
+    <add key="Word" value="..\..\..\Resource\Doc.docx"/>
+    <add key="OneWithFileData" value="..\..\..\Resource\OneWithFileData.one"/>
+    <add key="OneWithoutFileData" value="..\..\..\Resource\OneWithoutFileData.one"/>
+    <add key="NotebookTableOfContents" value="..\..\..\Resource\Open Notebook.onetoc2"/>
+    <add key="OneEncryption" value="..\..\..\Resource\Encryption.one"/>
     <!-- The default wait time when finding element.-->
-    <add key="DefaultWaitTime" value="30" />
-    <add key="UIWaitTime" value="15" />
+    <add key="DefaultWaitTime" value="30"/>
+    <add key="UIWaitTime" value="15"/>
     <!-- The capture tool setting.-->
-    <add key="StartScriptPath" value="..\..\..\Resource\StartRemoteRun.ps1" />
-    <add key="StopScriptPath" value="..\..\..\Resource\StopRemoteRun.ps1" />
-    <add key="Powershell_Path" value="%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe" />
-    <add key="path" value="\\SUT02\Wenbo\aa.cap" />
-    <add key="defaultUserNameForFiddler" value="plugdevuser19" />
-    <add key="FiddlerPath" value="C:\Users\plugdevuser19\AppData\Local\Programs\Fiddler" />
-    <add key="BatPath" value="..\..\..\Resource\Converter.bat" />
-    <add key="ClientSettingsProvider.ServiceUri" value="" />
+    <add key="StartScriptPath" value="..\..\..\Resource\StartRemoteRun.ps1"/>
+    <add key="StopScriptPath" value="..\..\..\Resource\StopRemoteRun.ps1"/>
+    <add key="Powershell_Path" value="%SystemRoot%\system32\WindowsPowerShell\v1.0\powershell.exe"/>
+    <add key="path" value="\\SUT02\Wenbo\aa.cap"/>
+    <add key="defaultUserNameForFiddler" value="plugdevuser19"/>
+    <add key="FiddlerPath" value="C:\Users\plugdevuser19\AppData\Local\Programs\Fiddler"/>
+    <add key="BatPath" value="..\..\..\Resource\Converter.bat"/>
+    <add key="ClientSettingsProvider.ServiceUri" value=""/>
   </appSettings>
   <startup>
-    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.6.1" />
+    <supportedRuntime version="v4.0" sku=".NETFramework,Version=v4.8"/>
   </startup>
   <system.web>
     <membership defaultProvider="ClientAuthenticationMembershipProvider">
       <providers>
-        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" />
+        <add name="ClientAuthenticationMembershipProvider" type="System.Web.ClientServices.Providers.ClientFormsAuthenticationMembershipProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri=""/>
       </providers>
     </membership>
     <roleManager defaultProvider="ClientRoleProvider" enabled="true">
       <providers>
-        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400" />
+        <add name="ClientRoleProvider" type="System.Web.ClientServices.Providers.ClientRoleProvider, System.Web.Extensions, Version=4.0.0.0, Culture=neutral, PublicKeyToken=31bf3856ad364e35" serviceUri="" cacheTimeout="86400"/>
       </providers>
     </roleManager>
   </system.web>
-</configuration>
\ No newline at end of file
+</configuration>
diff --git a/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/WOPIautomation.csproj b/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/WOPIautomation.csproj
index 20bdfcb..9fad9af 100644
--- a/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/WOPIautomation.csproj
+++ b/FSSHTTPWOPIInspector/Test/WOPIautomation/WOPIautomation/WOPIautomation.csproj
@@ -8,7 +8,7 @@
     <AppDesignerFolder>Properties</AppDesignerFolder>
     <RootNamespace>WOPIautomation</RootNamespace>
     <AssemblyName>WOPIautomation</AssemblyName>
-    <TargetFrameworkVersion>v4.6.1</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v4.8</TargetFrameworkVersion>
     <FileAlignment>512</FileAlignment>
     <ProjectTypeGuids>{3AC096D0-A1C2-E12C-1390-A8335801FDAB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}</ProjectTypeGuids>
     <VisualStudioVersion Condition="'$(VisualStudioVersion)' == ''">10.0</VisualStudioVersion>