Process ftp messages in parallel

Author: gave92

Files.Launcher/MessageHandlers/Win32MessageHandler.cs

@@ -62,7 +62,7 @@ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string,
                     var fileIconPath = (string)message["filePath"];
                     var thumbnailSize = (int)(long)message["thumbnailSize"];
                     var isOverlayOnly = (bool)message["isOverlayOnly"];
-                    var iconOverlay = Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath, thumbnailSize, true, isOverlayOnly)).Result;
+                    var iconOverlay = await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath, thumbnailSize, true, isOverlayOnly));
                     await Win32API.SendMessageAsync(connection, new ValueSet()
                     {
                         { "Icon", iconOverlay.icon },
@@ -73,7 +73,7 @@ public async Task ParseArgumentsAsync(PipeStream connection, Dictionary<string,
                 case "GetIconWithoutOverlay":
                     var fileIconPath2 = (string)message["filePath"];
                     var thumbnailSize2 = (int)(long)message["thumbnailSize"];
-                    var icon2 = Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath2, thumbnailSize2, false)).Result;
+                    var icon2 = await Win32API.StartSTATask(() => Win32API.GetFileIconAndOverlay(fileIconPath2, thumbnailSize2, false));
                     await Win32API.SendMessageAsync(connection, new ValueSet()
                     {
                         { "Icon", icon2.icon },

Files.Launcher/Program.cs

@@ -157,7 +157,7 @@ private static void EndReadCallBack(IAsyncResult result)
                 {
                     var message = info.Message.ToString().TrimEnd('\0');
 
-                    Connection_RequestReceived(connection, JsonConvert.DeserializeObject<Dictionary<string, object>>(message));
+                    _ = Task.Run(() => Connection_RequestReceived(connection, JsonConvert.DeserializeObject<Dictionary<string, object>>(message)));
 
                     // Begin a new reading operation
                     var nextInfo = (Buffer: new byte[connection.InBufferSize], Message: new StringBuilder());
@@ -170,7 +170,7 @@ private static void EndReadCallBack(IAsyncResult result)
             }
         }
 
-        private static async void Connection_RequestReceived(PipeStream conn, Dictionary<string, object> message)
+        private static async Task Connection_RequestReceived(PipeStream conn, Dictionary<string, object> message)
         {
             // Get a deferral because we use an awaitable API below to respond to the message
             // and we don't want this call to get cancelled while we are waiting.
@@ -187,7 +187,7 @@ private static async void Connection_RequestReceived(PipeStream conn, Dictionary
                 var arguments = (string)message["Arguments"];
                 Logger.Info($"Argument: {arguments}");
 
-                await ParseArgumentsAsync(message, arguments);
+                await Extensions.IgnoreExceptions(() => ParseArgumentsAsync(message, arguments), Logger);
             }
         }
 

Files.Launcher/Win32API.cs

@@ -157,6 +157,8 @@ public static string[] CommandLineToArgs(string commandLine)
             }
         }
 
+        private static object lockObject = new object();
+
         public static (string icon, string overlay) GetFileIconAndOverlay(string path, int thumbnailSize, bool getOverlay = true, bool onlyGetOverlay = false)
         {
             string iconStr = null, overlayStr = null;
@@ -197,24 +199,31 @@ public static (string icon, string overlay) GetFileIconAndOverlay(string path, i
                 }
 
                 User32.DestroyIcon(shfi.hIcon);
-                Shell32.SHGetImageList(Shell32.SHIL.SHIL_LARGE, typeof(ComCtl32.IImageList).GUID, out var tmp);
-                using var imageList = ComCtl32.SafeHIMAGELIST.FromIImageList(tmp);
-                if (imageList.IsNull || imageList.IsInvalid)
-                {
-                    return (iconStr, null);
-                }
 
-                var overlayIdx = shfi.iIcon >> 24;
-                if (overlayIdx != 0)
+                lock (lockObject)
                 {
-                    var overlayImage = imageList.Interface.GetOverlayImage(overlayIdx);
-                    using var hOverlay = imageList.Interface.GetIcon(overlayImage, ComCtl32.IMAGELISTDRAWFLAGS.ILD_TRANSPARENT);
-                    if (!hOverlay.IsNull && !hOverlay.IsInvalid)
+                    if (!Shell32.SHGetImageList(Shell32.SHIL.SHIL_LARGE, typeof(ComCtl32.IImageList).GUID, out var imageList).Succeeded)
                     {
-                        using var image = hOverlay.ToIcon().ToBitmap();
-                        byte[] bitmapData = (byte[])new ImageConverter().ConvertTo(image, typeof(byte[]));
-                        overlayStr = Convert.ToBase64String(bitmapData, 0, bitmapData.Length);
+                        return (iconStr, null);
                     }
+
+                    var overlayIdx = shfi.iIcon >> 24;
+                    if (overlayIdx != 0)
+                    {
+                        var overlayImage = imageList.GetOverlayImage(overlayIdx);
+                        using var hOverlay = imageList.GetIcon(overlayImage, ComCtl32.IMAGELISTDRAWFLAGS.ILD_TRANSPARENT);
+                        if (!hOverlay.IsNull && !hOverlay.IsInvalid)
+                        {
+                            using (var icon = hOverlay.ToIcon())
+                            using (var image = icon.ToBitmap())
+                            {
+                                byte[] bitmapData = (byte[])new ImageConverter().ConvertTo(image, typeof(byte[]));
+                                overlayStr = Convert.ToBase64String(bitmapData, 0, bitmapData.Length);
+                            }
+                        }
+                    }
+
+                    Marshal.ReleaseComObject(imageList);
                 }
 
                 return (iconStr, overlayStr);