Fix folder shortcuts opening in explorer (#7391)

Author: gave92

src/Files.Launcher/Helpers/ShellFolderHelpers.cs

@@ -85,7 +85,7 @@ public static ShellLinkItem GetShellLinkItem(ShellLink linkItem)
                 return null;
             }
             var link = new ShellLinkItem(baseItem);
-            link.IsFolder = !string.IsNullOrEmpty(link.TargetPath) && linkItem.Target.IsFolder;
+            link.IsFolder = !string.IsNullOrEmpty(linkItem.TargetPath) && linkItem.Target.IsFolder;
             link.RunAsAdmin = linkItem.RunAsAdministrator;
             link.Arguments = linkItem.Arguments;
             link.WorkingDirectory = linkItem.WorkingDirectory;

src/Files.Launcher/MessageHandlers/FileOperationsHandler.cs

@@ -531,7 +531,7 @@ await Win32API.StartSTATask(() =>
                         Program.Logger.Warn(ex, ex.Message);
                         await Win32API.SendMessageAsync(connection, new ValueSet()
                         {
-                            { "ShortcutInfo", JsonConvert.SerializeObject(null) }
+                            { "ShortcutInfo", JsonConvert.SerializeObject(new ShellLinkItem()) }
                         }, message.Get("RequestID", (string)null));
                     }
                     break;

src/Files/Filesystem/FilesystemOperations/Helpers/FilesystemHelpers.cs

@@ -1111,6 +1111,8 @@ public static async Task<IEnumerable<IStorageItemWithPath>> GetDraggedStorageIte
                     itemsList.AddRange(source);
                 }
             }
+            itemsList = itemsList.DistinctBy(x => string.IsNullOrEmpty(x.Path) ?
+                (string.IsNullOrEmpty(x.Item.Path) ? x.Item.Name : x.Item.Path) : x.Path).ToList();
             return itemsList;
         }
 

src/Files/Filesystem/StorageEnumerators/Win32StorageEnumerator.cs

@@ -270,7 +270,10 @@ CancellationToken cancellationToken
                     {
                         var isUrl = findData.cFileName.EndsWith(".url", StringComparison.OrdinalIgnoreCase);
                         var shInfo = JsonConvert.DeserializeObject<ShellLinkItem>((string)response["ShortcutInfo"]);
-
+                        if (shInfo == null)
+                        {
+                            return null;
+                        }
                         return new ShortcutItem(null, dateReturnFormat)
                         {
                             PrimaryItemAttribute = shInfo.IsFolder ? StorageItemTypes.Folder : StorageItemTypes.File,

src/Files/Helpers/ItemListDisplayHelpers/SortingHelper.cs

@@ -37,7 +37,7 @@ public static IEnumerable<ListedItem> OrderFileList(List<ListedItem> filesAndFol
 
             // In ascending order, show folders first, then files.
             // So, we use == StorageItemTypes.File to make the value for a folder equal to 0, and equal to 1 for the rest.
-            static bool folderThenFileAsync(ListedItem listedItem) => (listedItem.PrimaryItemAttribute == StorageItemTypes.File || listedItem.IsZipItem);
+            static bool folderThenFileAsync(ListedItem listedItem) => (listedItem.PrimaryItemAttribute == StorageItemTypes.File || listedItem.IsShortcutItem || listedItem.IsZipItem);
             IOrderedEnumerable<ListedItem> ordered;
 
             IUserSettingsService userSettingsService = Ioc.Default.GetService<IUserSettingsService>();