A little more work on the deskbands

Author: dwmkerr

SharpShell/SharpShell/Interop/IInputObject.cs

@@ -0,0 +1,39 @@
+using System.Runtime.InteropServices;
+using System.Security;
+
+namespace SharpShell.Interop
+{
+    /// <summary>
+    /// Exposes methods that change UI activation and process accelerators for a user input object contained in the Shell.
+    /// </summary>
+    [ComImport]
+    [InterfaceType(ComInterfaceType.InterfaceIsIUnknown)]
+    [Guid("68284faa-6a48-11d0-8c78-00c04fd918b4")]
+    [SuppressUnmanagedCodeSecurity]
+    public interface IInputObject
+    {
+        /// <summary>
+        /// UI-activates or deactivates the object.
+        /// </summary>
+        /// <param name="fActivate">Indicates if the object is being activated or deactivated. If this value is nonzero, the object is being activated. If this value is zero, the object is being deactivated.</param>
+        /// <param name="msg">A pointer to an MSG structure that contains the message that caused the activation change. This value may be NULL.</param>
+        /// <returns>If this method succeeds, it returns S_OK. Otherwise, it returns an HRESULT error code.</returns>
+        [PreserveSig]
+        int UIActivateIO(int fActivate, ref MSG msg);
+
+        /// <summary>
+        /// Determines if one of the object's windows has the keyboard focus.
+        /// </summary>
+        /// <returns>Returns S_OK if one of the object's windows has the keyboard focus, or S_FALSE otherwise.</returns>
+        [PreserveSig]
+        int HasFocusIO();
+
+        /// <summary>
+        /// Enables the object to process keyboard accelerators.
+        /// </summary>
+        /// <param name="msg">The address of an MSG structure that contains the keyboard message that is being translated.</param>
+        /// <returns>Returns S_OK if the accelerator was translated, or S_FALSE otherwise.</returns>
+        [PreserveSig]
+        int TranslateAcceleratorIO(ref MSG msg);
+    }
+}

SharpShell/SharpShell/Interop/IPersistStream.cs

@@ -1,7 +1,5 @@
 using System;
 using System.Runtime.InteropServices;
-using System.Runtime.InteropServices.ComTypes;
-
 namespace SharpShell.Interop
 {
     /// <summary>
@@ -28,7 +26,7 @@ public interface IPersistStream : IPersist
         /// <param name="pStm">An IStream pointer to the stream from which the object should be loaded.</param>
         /// <returns>This method can return the following values. S_OK, E_OUTOFMEMORY, E_FAIL.</returns>
         [PreserveSig]
-        int Load(IStream pStm);
+        int Load([In, MarshalAs(UnmanagedType.Interface)] object pStm);
 
         /// <summary>
         /// Saves an object to the specified stream.
@@ -37,14 +35,14 @@ public interface IPersistStream : IPersist
         /// <param name="fClearDirty">Indicates whether to clear the dirty flag after the save is complete. If TRUE, the flag should be cleared. If FALSE, the flag should be left unchanged.</param>
         /// <returns>This method can return the following values. S_OK, STG_E_CANTSAVE, STG_E_MEDIUMFULL.</returns>
         [PreserveSig]
-        int Save(IStream pStm, bool fClearDirty);
+        int Save([In, MarshalAs(UnmanagedType.Interface)] IntPtr pStm, bool fClearDirty);
 
         /// <summary>
         /// Retrieves the size of the stream needed to save the object.
         /// </summary>
         /// <param name="pcbSize">The size in bytes of the stream needed to save this object, in bytes.</param>
         /// <returns>This method returns S_OK to indicate that the size was retrieved successfully.</returns>
         [PreserveSig]
-        int GetSizeMax(out UInt64 pcbSize);
+        int GetSizeMax(out ulong pcbSize);
     }
 }

SharpShell/SharpShell/SharpDeskBand/SharpDeskBand.cs

@@ -1,13 +1,7 @@
 using System;
-using System.Collections.Generic;
 using System.Drawing;
-using System.Linq;
-using System.Security.AccessControl;
-using System.Text;
-using Microsoft.Win32;
 using SharpShell.Attributes;
 using SharpShell.Components;
-using SharpShell.Extensions;
 using SharpShell.Interop;
 using System.Windows.Forms;
 using SharpShell.ServerRegistration;
@@ -38,11 +32,6 @@ protected SharpDeskBand()
         /// The handle to the parent window site.
         /// </summary>
         private IntPtr parentWindowHandle;
-        
-        /// <summary>
-        /// The band ID provided by explorer to identify the band.
-        /// </summary>
-        private uint explorerBandId = 0;
 
         #region Implmentation of the IObjectWithSite interface
 
@@ -70,7 +59,14 @@ int IObjectWithSite.SetSite(object pUnkSite)
             //  If we have not been provided a site, the band is being removed.
             if (pUnkSite == null)
             {
-                DestroyBand();
+                OnBandRemoved();
+                if (lazyDeskBand.IsValueCreated)
+                {
+                    lazyDeskBand.Value.Hide();
+                    User32.SetParent(lazyDeskBand.Value.Handle, IntPtr.Zero);
+                    lazyDeskBand.Value.Dispose();
+                    lazyDeskBand = new Lazy<UserControl>(CreateDeskBand);
+                }
                 return WinError.S_OK;
             }
 
@@ -105,20 +101,6 @@ int IObjectWithSite.SetSite(object pUnkSite)
             return WinError.S_OK;
         }
 
-        private void DestroyBand()
-        {
-            //  Log key events.
-            Log("SharpDeskban.DestroyBand called.");
-            OnBandRemoved();
-            if (lazyDeskBand.IsValueCreated)
-            {
-                lazyDeskBand.Value.Hide();
-                User32.SetParent(lazyDeskBand.Value.Handle, IntPtr.Zero);
-                lazyDeskBand.Value.Dispose();
-                lazyDeskBand = new Lazy<UserControl>(CreateDeskBand);
-            }
-        }
-
         #endregion
 
         #region Implementation of IPersistStream
@@ -147,7 +129,7 @@ int IPersistStream.IsDirty()
             return WinError.S_FALSE;
         }
 
-        int IPersistStream.Load(System.Runtime.InteropServices.ComTypes.IStream pStm)
+        int IPersistStream.Load(object pStm)
         {
             //  Log key events.
             Log("IPersistStream.Load called.");
@@ -156,7 +138,7 @@ int IPersistStream.Load(System.Runtime.InteropServices.ComTypes.IStream pStm)
             return WinError.S_OK;
         }
 
-        int IPersistStream.Save(System.Runtime.InteropServices.ComTypes.IStream pStm, bool fClearDirty)
+        int IPersistStream.Save(IntPtr pStm, bool fClearDirty)
         {
             //  Log key events.
             Log("IPersistStream.Save called.");
@@ -219,9 +201,6 @@ int IDeskBand.GetBandInfo(uint dwBandID, DESKBANDINFO.DBIF dwViewMode, ref DESKB
             //  Log key events.
             Log("IDeskBand.GetBandInfo called.");
 
-            //  Store the band id.
-            explorerBandId = dwBandID;
-
             //  Depending on what we've been asked for, we'll return various band properties.
             var bandOptions = GetBandOptions();
             var bandUi = lazyDeskBand.Value;

SharpShell/SharpShell/SharpShell.csproj

@@ -100,6 +100,7 @@
     <Compile Include="Interop\IDeskBand2.cs" />
     <Compile Include="Interop\IExtractIconA.cs" />
     <Compile Include="Interop\IExtractIconW.cs" />
+    <Compile Include="Interop\IInputObject.cs" />
     <Compile Include="Interop\IInputObjectSite.cs" />
     <Compile Include="Interop\IMAGEINFO.cs" />
     <Compile Include="Interop\IMAGELISTDRAWPARAMS.cs" />