[Hidden files] - Show thumbnail (#2388)

Author: gave92

Files.Launcher/Program.cs

@@ -300,10 +300,12 @@ private static async Task ParseArgumentsAsync(AppServiceRequestReceivedEventArgs
 
                 case "GetIconOverlay":
                     var fileIconPath = (string)args.Request.Message["filePath"];
-                    var iconOverlay = Win32API.GetFileOverlayIcon(fileIconPath);
+                    var thumbnailSize = (int)args.Request.Message["thumbnailSize"];
+                    var iconOverlay = Win32API.GetFileIconAndOverlay(fileIconPath, thumbnailSize);
                     await args.Request.SendResponseAsync(new ValueSet()
                     {
-                        { "IconOverlay", iconOverlay.icon },
+                        { "Icon", iconOverlay.icon },
+                        { "Overlay", iconOverlay.overlay },
                         { "HasCustomIcon", iconOverlay.isCustom }
                     });
                     break;

Files.Launcher/Win32API.cs

@@ -2,6 +2,7 @@
 using System.ComponentModel;
 using System.Diagnostics;
 using System.Drawing;
+using System.Drawing.Imaging;
 using System.IO;
 using System.Linq;
 using System.Runtime.InteropServices;
@@ -93,13 +94,13 @@ public static string[] CommandLineToArgs(string commandLine)
             }
         }
 
-        public static (string icon, bool isCustom) GetFileOverlayIcon(string path)
+        public static (string icon, string overlay, bool isCustom) GetFileIconAndOverlay(string path, int thumbnailSize)
         {
             var shfi = new Shell32.SHFILEINFO();
             var ret = Shell32.SHGetFileInfo(path, 0, ref shfi, Shell32.SHFILEINFO.Size, Shell32.SHGFI.SHGFI_OVERLAYINDEX | Shell32.SHGFI.SHGFI_ICON | Shell32.SHGFI.SHGFI_SYSICONINDEX | Shell32.SHGFI.SHGFI_ICONLOCATION);
             if (ret == IntPtr.Zero)
             {
-                return (null, false);
+                return (null, null, false);
             }
 
             bool isCustom = !shfi.szDisplayName.StartsWith(Environment.GetFolderPath(Environment.SpecialFolder.Windows));
@@ -108,26 +109,43 @@ public static (string icon, bool isCustom) GetFileOverlayIcon(string path)
             using var imageList = ComCtl32.SafeHIMAGELIST.FromIImageList(tmp);
             if (imageList.IsNull || imageList.IsInvalid)
             {
-                return (null, isCustom);
+                return (null, null, isCustom);
             }
 
+            string iconStr = null, overlayStr = null;
             var overlay_idx = shfi.iIcon >> 24;
-            //var icon_idx = shfi.iIcon & 0xFFFFFF;
-            if (overlay_idx == 0)
+            if (overlay_idx != 0)
             {
-                return (null, isCustom);
+                var overlay_image = imageList.Interface.GetOverlayImage(overlay_idx);
+                using var hOverlay = imageList.Interface.GetIcon(overlay_image, ComCtl32.IMAGELISTDRAWFLAGS.ILD_TRANSPARENT);
+                if (!hOverlay.IsNull && !hOverlay.IsInvalid)
+                {
+                    using var image = hOverlay.ToIcon().ToBitmap();
+                    byte[] bitmapData = (byte[])new ImageConverter().ConvertTo(image, typeof(byte[]));
+                    overlayStr = Convert.ToBase64String(bitmapData, 0, bitmapData.Length);
+                }
             }
 
-            var overlay_image = imageList.Interface.GetOverlayImage(overlay_idx);
-            using var hIcon = imageList.Interface.GetIcon(overlay_image, ComCtl32.IMAGELISTDRAWFLAGS.ILD_TRANSPARENT);
-            if (hIcon.IsNull || hIcon.IsInvalid)
+            // The following only returns the icon (not thumbnail) and it's difficult to get a high-res icon
+            //var icon_idx = shfi.iIcon & 0xFFFFFF;
+            //using var hIcon = imageList.Interface.GetIcon(icon_idx, ComCtl32.IMAGELISTDRAWFLAGS.ILD_TRANSPARENT);
+
+            using var shellItem = new Vanara.Windows.Shell.ShellItem(path);
+            if (shellItem.IShellItem is Shell32.IShellItemImageFactory fctry)
             {
-                return (null, isCustom);
+                var flags = Shell32.SIIGBF.SIIGBF_BIGGERSIZEOK;
+                if (thumbnailSize < 80) flags |= Shell32.SIIGBF.SIIGBF_ICONONLY;
+                var hres = fctry.GetImage(new SIZE(thumbnailSize, thumbnailSize), flags, out var hbitmap);
+                if (hres == HRESULT.S_OK)
+                {
+                    using var image = GetBitmapFromHBitmap(hbitmap);
+                    byte[] bitmapData = (byte[])new ImageConverter().ConvertTo(image, typeof(byte[]));
+                    iconStr = Convert.ToBase64String(bitmapData, 0, bitmapData.Length);
+                }
+                //Marshal.ReleaseComObject(fctry);
             }
 
-            using var image = hIcon.ToIcon().ToBitmap();
-            byte[] bitmapData = (byte[])new ImageConverter().ConvertTo(image, typeof(byte[]));
-            return (Convert.ToBase64String(bitmapData, 0, bitmapData.Length), isCustom);
+            return (iconStr, overlayStr, isCustom);
         }
 
         private static void RunPowershellCommand(string command, bool runAsAdmin)
@@ -171,6 +189,63 @@ public static void SetVolumeLabel(string driveName, string newLabel)
             RunPowershellCommand($"-command \"$Signature = '[DllImport(\\\"kernel32.dll\\\", SetLastError = false)]public static extern bool SetVolumeLabel(string lpRootPathName, string lpVolumeName);'; $SetVolumeLabel = Add-Type -MemberDefinition $Signature -Name \"Win32SetVolumeLabel\" -Namespace Win32Functions -PassThru; $SetVolumeLabel::SetVolumeLabel('{driveName}', '{newLabel}')\"", true);
         }
 
+        private static Bitmap GetBitmapFromHBitmap(HBITMAP hBitmap)
+        {
+            Bitmap bmp = hBitmap.ToBitmap();
+
+            if (Bitmap.GetPixelFormatSize(bmp.PixelFormat) < 32)
+            {
+                return bmp;
+            }
+
+            if (IsAlphaBitmap(bmp, out var bmpData))
+            {
+                return GetAlphaBitmapFromBitmapData(bmpData);
+            }
+
+            return bmp;
+        }
+
+        private static Bitmap GetAlphaBitmapFromBitmapData(BitmapData bmpData)
+        {
+            return new Bitmap(
+                    bmpData.Width,
+                    bmpData.Height,
+                    bmpData.Stride,
+                    PixelFormat.Format32bppArgb,
+                    bmpData.Scan0);
+        }
+
+        private static bool IsAlphaBitmap(Bitmap bmp, out BitmapData bmpData)
+        {
+            Rectangle bmBounds = new Rectangle(0, 0, bmp.Width, bmp.Height);
+
+            bmpData = bmp.LockBits(bmBounds, ImageLockMode.ReadOnly, bmp.PixelFormat);
+
+            try
+            {
+                for (int y = 0; y <= bmpData.Height - 1; y++)
+                {
+                    for (int x = 0; x <= bmpData.Width - 1; x++)
+                    {
+                        Color pixelColor = Color.FromArgb(
+                            Marshal.ReadInt32(bmpData.Scan0, (bmpData.Stride * y) + (4 * x)));
+
+                        if (pixelColor.A > 0 & pixelColor.A < 255)
+                        {
+                            return true;
+                        }
+                    }
+                }
+            }
+            finally
+            {
+                bmp.UnlockBits(bmpData);
+            }
+
+            return false;
+        }
+
         // There is usually no need to define Win32 COM interfaces/P-Invoke methods here.
         // The Vanara library contains the definitions for all members of Shell32.dll, User32.dll and more
         // The ones below are due to bugs in the current version of the library and can be removed once fixed

Files.Launcher/Win32API_ContextMenu.cs

@@ -5,7 +5,6 @@
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.Drawing;
-using System.Drawing.Imaging;
 using System.Linq;
 using System.Runtime.InteropServices;
 using System.Threading;
@@ -340,63 +339,6 @@ private static string GetCommandString(Shell32.IContextMenu cMenu, uint offset,
                 }
             }
 
-            private static Bitmap GetBitmapFromHBitmap(HBITMAP hBitmap)
-            {
-                Bitmap bmp = hBitmap.ToBitmap();
-
-                if (Bitmap.GetPixelFormatSize(bmp.PixelFormat) < 32)
-                {
-                    return bmp;
-                }
-
-                if (IsAlphaBitmap(bmp, out var bmpData))
-                {
-                    return GetAlphaBitmapFromBitmapData(bmpData);
-                }
-
-                return bmp;
-            }
-
-            private static Bitmap GetAlphaBitmapFromBitmapData(BitmapData bmpData)
-            {
-                return new Bitmap(
-                        bmpData.Width,
-                        bmpData.Height,
-                        bmpData.Stride,
-                        PixelFormat.Format32bppArgb,
-                        bmpData.Scan0);
-            }
-
-            private static bool IsAlphaBitmap(Bitmap bmp, out BitmapData bmpData)
-            {
-                Rectangle bmBounds = new Rectangle(0, 0, bmp.Width, bmp.Height);
-
-                bmpData = bmp.LockBits(bmBounds, ImageLockMode.ReadOnly, bmp.PixelFormat);
-
-                try
-                {
-                    for (int y = 0; y <= bmpData.Height - 1; y++)
-                    {
-                        for (int x = 0; x <= bmpData.Width - 1; x++)
-                        {
-                            Color pixelColor = Color.FromArgb(
-                                Marshal.ReadInt32(bmpData.Scan0, (bmpData.Stride * y) + (4 * x)));
-
-                            if (pixelColor.A > 0 & pixelColor.A < 255)
-                            {
-                                return true;
-                            }
-                        }
-                    }
-                }
-                finally
-                {
-                    bmp.UnlockBits(bmpData);
-                }
-
-                return false;
-            }
-
             #region IDisposable Support
 
             private bool disposedValue = false; // To detect redundant calls