v6.4.21218.0

ITHitBuild · ITHitBuild · commit 0a8c58e09088 · 2023-04-02T00:11:45.000+03:00
diff --git a/Common/Common.csproj b/Common/Common.csproj
@@ -10,7 +10,7 @@
     <Platforms>AnyCPU;x64</Platforms>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.4.21210.0" />
-    <PackageReference Include="ITHit.FileSystem" Version="6.4.21210.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.4.21218.0" />
+    <PackageReference Include="ITHit.FileSystem" Version="6.4.21218.0" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Common.Windows.Core.csproj b/Windows/Common/Core/Common.Windows.Core.csproj
@@ -20,8 +20,8 @@
     <PackageReference Include="Microsoft.Windows.SDK.Contracts" Version="10.0.19041.1" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.4.21210.0" />
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.4.21210.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.4.21218.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.4.21218.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
   </ItemGroup>
 </Project>
diff --git a/Windows/Common/Core/Registrar.cs b/Windows/Common/Core/Registrar.cs
@@ -23,7 +23,7 @@ public class Registrar
         protected readonly string SyncRootId;
         protected readonly string UserFileSystemRootPath;
         protected readonly ILog Log;
-        private readonly IEnumerable<(string Name, Guid Guid)> shellExtensionHandlers;
+        private readonly IEnumerable<(string Name, Guid Guid, bool AlwaysRegister)> shellExtensionHandlers;
 
         /// <summary>
         /// Creates instance of this class.
@@ -37,7 +37,7 @@ public class Registrar
         /// List of shell extension handlers. Use it only for applications without application or package identity.
         /// For applications with identity this list is ignored.
         /// </param>
-        public Registrar(string syncRootId, string userFileSystemRootPath, ILog log, IEnumerable<(string Name, Guid Guid)> shellExtensionHandlers = null)
+        public Registrar(string syncRootId, string userFileSystemRootPath, ILog log, IEnumerable<(string Name, Guid Guid, bool AlwaysRegister)> shellExtensionHandlers = null)
         {
             this.SyncRootId = syncRootId;
             this.UserFileSystemRootPath = userFileSystemRootPath;
@@ -71,16 +71,8 @@ public async Task RegisterSyncRootAsync(string displayName, string iconPath, str
 
             if (shellExtensionHandlers != null)
             {
-                // Register thumbnails handler, custom states handler, etc,
-                // but only if this app has no identity. Otherwise manifest will do this automatically.
-                if (!PackageRegistrar.IsRunningWithIdentity())
-                {
-                    RegisterShellExtensions(shellExtensionsComServerExePath);
-                }
-                //else
-                //{
-                //    Log.Debug("\nThis app has identity. Shell extensions list is ignored. Shell extensions must be installed via sparse package manifest or app packaged app manifest.");
-                //}
+                // Register thumbnails handler, custom states handler, etc.
+                RegisterShellExtensions(shellExtensionsComServerExePath);
             }
         }
 
@@ -166,13 +158,18 @@ public virtual async Task UnregisterAsync(EngineWindows engine, bool fullUnregis
         /// </remarks>
         private void RegisterShellExtensions(string shellExtensionsComServerExePath = null)
         {
+            bool isRunningWithIdentity = PackageRegistrar.IsRunningWithIdentity();
             foreach (var handler in shellExtensionHandlers)
             {
                 if (!ShellExtensionRegistrar.IsHandlerRegistered(handler.Guid))
                 {
-                    Log.Info($"\nRegistering shell extension {handler.Name} with CLSID {handler.Guid:B}...\n");
-
-                    ShellExtensionRegistrar.RegisterHandler(SyncRootId, handler.Name, handler.Guid, shellExtensionsComServerExePath);
+                    // Register handlers only if this app has no identity. Otherwise manifest will do this automatically.
+                    // Unlike other handlers, CopyHook requires registration regardless of identity.
+                    if (!isRunningWithIdentity || handler.AlwaysRegister)
+                    {
+                        Log.Info($"\nRegistering shell extension {handler.Name} with CLSID {handler.Guid:B}...\n");
+                        ShellExtensionRegistrar.RegisterHandler(SyncRootId, handler.Name, handler.Guid, shellExtensionsComServerExePath);
+                    }
                 }
             }
         }
diff --git a/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj b/Windows/Common/VirtualDrive/Common.Windows.VirtualDrive.csproj
@@ -13,7 +13,7 @@
     <Compile Remove="IVirtualFolder.cs" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.4.21210.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows" Version="6.4.21218.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\Core\Common.Windows.Core.csproj" />
   </ItemGroup>
diff --git a/Windows/Common/VirtualDrive/SparsePackageRegistrar.cs b/Windows/Common/VirtualDrive/SparsePackageRegistrar.cs
@@ -35,7 +35,7 @@ public SparsePackageRegistrar(
             string syncRootId,
             string userFileSystemRootPath,
             ILog log,
-            IEnumerable<(string Name, Guid Guid)> shellExtensionHandlers = null)
+            IEnumerable<(string Name, Guid Guid, bool AlwaysRegister)> shellExtensionHandlers = null)
             : base(syncRootId, userFileSystemRootPath, log, shellExtensionHandlers)
         {
 
diff --git a/Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj b/Windows/VirtualDrive/VirtualDrive.ShellExtension/VirtualDrive.ShellExtension.csproj
@@ -19,7 +19,7 @@
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.4.21210.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.4.21218.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">
diff --git a/Windows/VirtualDrive/VirtualDrive/Program.cs b/Windows/VirtualDrive/VirtualDrive/Program.cs
@@ -139,9 +139,6 @@ private static async Task RunEngine()
             // Register sync root and create app folders.
             await registrar.RegisterSyncRootAsync(Settings.ProductName, Path.Combine(Settings.IconsFolderPath, "Drive.ico"), Settings.ShellExtensionsComServerExePath);
 
-            // Register hook that allows limiting folder operations in GetFolderOperationControlAsync() method.
-            ShellExtension.ShellExtensions.RegisterCopyHook(SyncRootId);
-
             using (Engine = new VirtualEngine(
                     Settings.UserFileSystemLicense,
                     Settings.UserFileSystemRootPath,
diff --git a/Windows/VirtualDrive/VirtualDrive/ShellExtension/ShellExtensions.cs b/Windows/VirtualDrive/VirtualDrive/ShellExtension/ShellExtensions.cs
@@ -6,6 +6,7 @@
 
 namespace VirtualDrive.ShellExtension
 {
+    /// <inheritdoc cref="IFolderWindows"/>
     /// <summary>
     /// Shell extension handlers registration and startup functionality.
     /// </summary>
@@ -21,13 +22,13 @@ internal static class ShellExtensions
         /// Note that on Windows 11 your context menu will be shown under the "Show more options"
         /// menu if your app runs without identity.
         /// </remarks>
-        internal static readonly List<(string Name, Guid Guid)> Handlers = new List<(string, Guid)>
+        internal static readonly List<(string Name, Guid Guid, bool AlwaysRegister)> Handlers = new List<(string, Guid, bool)>
         {
-            ("ThumbnailProvider", typeof(ThumbnailProviderIntegrated).GUID),
-            ("MenuVerbHandler_0", typeof(ContextMenuVerbIntegrated).GUID),
-            ("CustomStateHandler", typeof(CustomStateProviderIntegrated).GUID),
-            ("CopyHook", typeof(StorageProviderCopyHookIntegrated).GUID),
-            //("UriHandler", typeof(ShellExtension.UriSourceIntegrated).GUID)
+            ("ThumbnailProvider", typeof(ThumbnailProviderIntegrated).GUID, false),
+            ("MenuVerbHandler_0", typeof(ContextMenuVerbIntegrated).GUID, false),
+            ("CustomStateHandler", typeof(CustomStateProviderIntegrated).GUID, false),
+            ("CopyHook", typeof(StorageProviderCopyHookIntegrated).GUID, true),
+            //("UriHandler", typeof(ShellExtension.UriSourceIntegrated).GUID, false)
         };
 
         /// <summary>
@@ -55,10 +56,5 @@ internal static LocalServer StartComServer(bool shellExtensionsComServerRpcEnabl
 
             return server;
         }
-
-        public static void RegisterCopyHook(string syncRootId)
-        {
-            ShellExtensionRegistrar.RegisterHandler(syncRootId, "CopyHook", typeof(StorageProviderCopyHookIntegrated).GUID);
-        }
     }
 }
diff --git a/Windows/VirtualDrive/VirtualDrive/ShellExtension/StorageProviderCopyHookIntegrated.cs b/Windows/VirtualDrive/VirtualDrive/ShellExtension/StorageProviderCopyHookIntegrated.cs
@@ -5,6 +5,7 @@
 
 namespace VirtualDrive.ShellExtension
 {
+    
     /// <summary>
     /// Determines whether the Shell will allow to move, copy, delete, rename, hydrate and dehydrate a folder. 
     /// Runs in one process with Engine.
@@ -18,4 +19,5 @@ public StorageProviderCopyHookIntegrated() : base(Program.Engine)
           {
         }
     }
+    
 }
diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj b/Windows/VirtualDrive/VirtualDrive/VirtualDrive.csproj
@@ -40,7 +40,7 @@ This is an advanced project with ETags support, Microsoft Office documents editi
     <PackageReference Include="System.Drawing.Common" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.4.21210.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.4.21218.0" />
     <ProjectReference Include="..\..\..\Common\Common.csproj" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
   </ItemGroup>
diff --git a/Windows/VirtualDrive/VirtualDrive/VirtualFolder.cs b/Windows/VirtualDrive/VirtualDrive/VirtualFolder.cs
@@ -185,7 +185,7 @@ public async Task WriteAsync(IFolderMetadata folderMetadata, IOperationContext o
 
         
         /// <inheritdoc/>
-        public async Task<FolderOperationControl> GetFolderOperationControlAsync(FolderOperation fileOperation, string targetUserFileSystemPath, IntPtr parentWindow, uint flags, FileAttributes sourceAttributes, FileAttributes targetAttributes)
+        public async Task<FolderOperationControl> GetFolderOperationControlAsync(FolderOperation fileOperation, string targetUserFileSystemPath, IntPtr parentWindow, FolderControlFlags flags, FileAttributes sourceAttributes, FileAttributes targetAttributes)
         {
             Logger.LogMessage($"{nameof(IFolder)}.{nameof(GetFolderOperationControlAsync)}()", UserFileSystemPath, targetUserFileSystemPath, default);
 
@@ -206,13 +206,10 @@ public async Task<FolderOperationControl> GetFolderOperationControlAsync(FolderO
         /// <param name="targetUserFileSystemPath">
         /// Name of the destination folder.
         /// </param>
-        /// <param name="context">
-        /// Extended information for hook handler.
-        /// </param>
         /// <returns>
         /// Value that indicates whether the Shell should perform the operation.
         /// </returns>
-        private FolderOperationControl ConfirmOperation(FolderOperation fileOperation, string targetUserFileSystemPath, IntPtr parentWindow, uint flags, FileAttributes sourceAttributes, FileAttributes destinationAttributes)
+        private FolderOperationControl ConfirmOperation(FolderOperation fileOperation, string targetUserFileSystemPath, IntPtr parentWindow, FolderControlFlags flags, FileAttributes sourceAttributes, FileAttributes destinationAttributes)
         {
             string message = $"Operation: {fileOperation}\n" +
                 $"Source path: {UserFileSystemPath}\n" +
diff --git a/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj b/Windows/WebDAVDrive/WebDAVDrive.ShellExtension/WebDAVDrive.ShellExtension.csproj
@@ -12,7 +12,7 @@
     <Copyright>IT HIT LTD.</Copyright>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.4.21210.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.ShellExtension" Version="6.4.21218.0" />
   </ItemGroup>
   <ItemGroup>
     <None Update="log4net.config">
diff --git a/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/ShellExtensions.cs b/Windows/WebDAVDrive/WebDAVDrive/ShellExtension/ShellExtensions.cs
@@ -21,12 +21,12 @@ internal static class ShellExtensions
         /// Note that on Windows 11 your context menu will be shown under the "Show more options"
         /// menu if your app runs without identity.
         /// </remarks>
-        internal static readonly List<(string Name, Guid Guid)> Handlers = new List<(string, Guid)>
+        internal static readonly List<(string Name, Guid Guid, bool AlwaysRegister)> Handlers = new List<(string, Guid, bool)>
         {
-            ("ThumbnailProvider", typeof(ThumbnailProviderIntegrated).GUID),
-            ("MenuVerbHandler_0", typeof(ContextMenuVerbIntegrated).GUID),
-            ("CustomStateHandler", typeof(CustomStateProviderIntegrated).GUID),
-            //("UriHandler", typeof(ShellExtension.UriSourceIntegrated).GUID)
+            ("ThumbnailProvider", typeof(ThumbnailProviderIntegrated).GUID, false),
+            ("MenuVerbHandler_0", typeof(ContextMenuVerbIntegrated).GUID, false),
+            ("CustomStateHandler", typeof(CustomStateProviderIntegrated).GUID, false),
+            //("UriHandler", typeof(ShellExtension.UriSourceIntegrated).GUID, false)
         };
 
         /// <summary>
diff --git a/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj b/Windows/WebDAVDrive/WebDAVDrive/WebDAVDrive.csproj
@@ -38,7 +38,7 @@
     <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="6.0.0" />
   </ItemGroup>
   <ItemGroup>
-    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.4.21210.0" />
+    <PackageReference Include="ITHit.FileSystem.Windows.Package" Version="6.4.21218.0" />
     <ProjectReference Include="..\..\Common\VirtualDrive\Common.Windows.VirtualDrive.csproj" />
     <ProjectReference Include="..\WebDAVDrive.UI\WebDAVDrive.UI.csproj" />
   </ItemGroup>

Original file line number	Diff line number	Diff line change
`@@ -23,7 +23,7 @@ public class Registrar`
`23`	`23`	`protected readonly string SyncRootId;`
`24`	`24`	`protected readonly string UserFileSystemRootPath;`
`25`	`25`	`protected readonly ILog Log;`
`26`		`- private readonly IEnumerable<(string Name, Guid Guid)> shellExtensionHandlers;`
	`26`	`+ private readonly IEnumerable<(string Name, Guid Guid, bool AlwaysRegister)> shellExtensionHandlers;`
`27`	`27`
`28`	`28`	`/// <summary>`
`29`	`29`	`/// Creates instance of this class.`
`@@ -37,7 +37,7 @@ public class Registrar`
`37`	`37`	`/// List of shell extension handlers. Use it only for applications without application or package identity.`
`38`	`38`	`/// For applications with identity this list is ignored.`
`39`	`39`	`/// </param>`
`40`		`- public Registrar(string syncRootId, string userFileSystemRootPath, ILog log, IEnumerable<(string Name, Guid Guid)> shellExtensionHandlers = null)`
	`40`	`+ public Registrar(string syncRootId, string userFileSystemRootPath, ILog log, IEnumerable<(string Name, Guid Guid, bool AlwaysRegister)> shellExtensionHandlers = null)`
`41`	`41`	`{`
`42`	`42`	`this.SyncRootId = syncRootId;`
`43`	`43`	`this.UserFileSystemRootPath = userFileSystemRootPath;`
`@@ -71,16 +71,8 @@ public async Task RegisterSyncRootAsync(string displayName, string iconPath, str`
`71`	`71`
`72`	`72`	`if (shellExtensionHandlers != null)`
`73`	`73`	`{`
`74`		`- // Register thumbnails handler, custom states handler, etc,`
`75`		`- // but only if this app has no identity. Otherwise manifest will do this automatically.`
`76`		`- if (!PackageRegistrar.IsRunningWithIdentity())`
`77`		`- {`
`78`		`- RegisterShellExtensions(shellExtensionsComServerExePath);`
`79`		`- }`
`80`		`- //else`
`81`		`- //{`
`82`		`- // Log.Debug("\nThis app has identity. Shell extensions list is ignored. Shell extensions must be installed via sparse package manifest or app packaged app manifest.");`
`83`		`- //}`
	`74`	`+ // Register thumbnails handler, custom states handler, etc.`
	`75`	`+ RegisterShellExtensions(shellExtensionsComServerExePath);`
`84`	`76`	`}`
`85`	`77`	`}`
`86`	`78`
`@@ -166,13 +158,18 @@ public virtual async Task UnregisterAsync(EngineWindows engine, bool fullUnregis`
`166`	`158`	`/// </remarks>`
`167`	`159`	`private void RegisterShellExtensions(string shellExtensionsComServerExePath = null)`
`168`	`160`	`{`
	`161`	`+ bool isRunningWithIdentity = PackageRegistrar.IsRunningWithIdentity();`
`169`	`162`	`foreach (var handler in shellExtensionHandlers)`
`170`	`163`	`{`
`171`	`164`	`if (!ShellExtensionRegistrar.IsHandlerRegistered(handler.Guid))`
`172`	`165`	`{`
`173`		`- Log.Info($"\nRegistering shell extension {handler.Name} with CLSID {handler.Guid:B}...\n");`
`174`		`-`
`175`		`- ShellExtensionRegistrar.RegisterHandler(SyncRootId, handler.Name, handler.Guid, shellExtensionsComServerExePath);`
	`166`	`+ // Register handlers only if this app has no identity. Otherwise manifest will do this automatically.`
	`167`	`+ // Unlike other handlers, CopyHook requires registration regardless of identity.`
	`168`	`+ if (!isRunningWithIdentity \|\| handler.AlwaysRegister)`
	`169`	`+ {`
	`170`	`+ Log.Info($"\nRegistering shell extension {handler.Name} with CLSID {handler.Guid:B}...\n");`
	`171`	`+ ShellExtensionRegistrar.RegisterHandler(SyncRootId, handler.Name, handler.Guid, shellExtensionsComServerExePath);`
	`172`	`+ }`
`176`	`173`	`}`
`177`	`174`	`}`
`178`	`175`	`}`
Original file line number	Diff line number	Diff line change
`@@ -35,7 +35,7 @@ public SparsePackageRegistrar(`
`35`	`35`	`string syncRootId,`
`36`	`36`	`string userFileSystemRootPath,`
`37`	`37`	`ILog log,`
`38`		`- IEnumerable<(string Name, Guid Guid)> shellExtensionHandlers = null)`
	`38`	`+ IEnumerable<(string Name, Guid Guid, bool AlwaysRegister)> shellExtensionHandlers = null)`
`39`	`39`	`: base(syncRootId, userFileSystemRootPath, log, shellExtensionHandlers)`
`40`	`40`	`{`
`41`	`41`
Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`
`6`	`6`	`namespace VirtualDrive.ShellExtension`
`7`	`7`	`{`
	`8`	`+`
`8`	`9`	`/// <summary>`
`9`	`10`	`/// Determines whether the Shell will allow to move, copy, delete, rename, hydrate and dehydrate a folder.`
`10`	`11`	`/// Runs in one process with Engine.`
`@@ -18,4 +19,5 @@ public StorageProviderCopyHookIntegrated() : base(Program.Engine)`
`18`	`19`	`{`
`19`	`20`	`}`
`20`	`21`	`}`
	`22`	`+`
`21`	`23`	`}`