Fix crash when enumerating folder contents on certain devices (#2886)

Author: gave92

Files/Helpers/NativeWinApiHelper.cs

@@ -196,5 +196,41 @@ public enum TokenAccess : uint
 
             TOKEN_EXECUTE = 0x00020000
         }
+
+        [DllImport("api-ms-win-core-wow64-l1-1-1.dll", SetLastError = true)]
+        private static extern bool IsWow64Process2(
+                IntPtr process,
+                out ushort processMachine,
+                out ushort nativeMachine);
+
+        // https://stackoverflow.com/questions/54456140/how-to-detect-were-running-under-the-arm64-version-of-windows-10-in-net
+        // https://docs.microsoft.com/en-us/windows/win32/sysinfo/image-file-machine-constants
+        private static bool? isRunningOnArm = null;
+
+        public static bool IsRunningOnArm
+        {
+            get
+            {
+                if (isRunningOnArm == null)
+                {
+                    isRunningOnArm = IsArmProcessor();
+                    NLog.LogManager.GetCurrentClassLogger().Info("Running on ARM: {0}", isRunningOnArm);
+                }
+                return isRunningOnArm ?? false;
+            }
+        }
+
+        private static bool IsArmProcessor()
+        {
+            var handle = System.Diagnostics.Process.GetCurrentProcess().Handle;
+            if (!IsWow64Process2(handle, out _, out var nativeMachine))
+            {
+                return false;
+            }
+            return (nativeMachine == 0xaa64 ||
+                    nativeMachine == 0x01c0 ||
+                    nativeMachine == 0x01c2 ||
+                    nativeMachine == 0x01c4);
+        }
     }
 }

Files/Helpers/NaturalStringComparer.cs

@@ -35,20 +35,38 @@ Int32 param
         );
     }
 
-    public class NaturalStringComparer : IComparer<object>
+    public class NaturalStringComparer
     {
-        public int Compare(object a, object b)
+        public static IComparer<object> GetForProcessor()
         {
-            return SafeNativeMethods.CompareStringEx(
-              SafeNativeMethods.LOCALE_NAME_USER_DEFAULT,
-              SafeNativeMethods.SORT_DIGITSASNUMBERS, // Add other flags if required.
-              a.ToString(),
-              a.ToString().Length,
-              b.ToString(),
-              b.ToString().Length,
-              IntPtr.Zero,
-              IntPtr.Zero,
-              0) - 2;
+            return NativeWinApiHelper.IsRunningOnArm ?
+                (IComparer<object>)new StringComparerArm64() :
+                (IComparer<object>)new StringComparerDefault();
+        }
+
+        private class StringComparerArm64 : IComparer<object>
+        {
+            public int Compare(object a, object b)
+            {
+                return StringComparer.CurrentCulture.Compare(a, b);
+            }
+        }
+
+        private class StringComparerDefault : IComparer<object>
+        {
+            public int Compare(object a, object b)
+            {
+                return SafeNativeMethods.CompareStringEx(
+                    SafeNativeMethods.LOCALE_NAME_USER_DEFAULT,
+                    SafeNativeMethods.SORT_DIGITSASNUMBERS, // Add other flags if required.
+                    a?.ToString(),
+                    a?.ToString().Length ?? 0,
+                    b?.ToString(),
+                    b?.ToString().Length ?? 0,
+                    IntPtr.Zero,
+                    IntPtr.Zero,
+                    0) - 2;
+            }
         }
     }
 }

Files/ViewModels/ItemViewModel.cs

@@ -496,7 +496,7 @@ private IList<ListedItem> OrderFiles2(IList<ListedItem> listToSort)
 
             static object orderByNameFunc(ListedItem item) => item.ItemName;
             Func<ListedItem, object> orderFunc = orderByNameFunc;
-            NaturalStringComparer naturalStringComparer = new NaturalStringComparer();
+            var naturalStringComparer = NaturalStringComparer.GetForProcessor();
             switch (FolderSettings.DirectorySortOption)
             {
                 case SortOption.Name:
@@ -553,54 +553,26 @@ private IList<ListedItem> OrderFiles2(IList<ListedItem> listToSort)
             }
             else
             {
-                if (FolderSettings.DirectorySortOption == SortOption.FileType)
+                if (FolderSettings.DirectorySortOption == SortOption.Name)
                 {
-                    if (FolderSettings.DirectorySortOption == SortOption.Name)
+                    if (AppSettings.ListAndSortDirectoriesAlongsideFiles)
                     {
-                        if (AppSettings.ListAndSortDirectoriesAlongsideFiles)
-                        {
-                            ordered = listToSort.OrderBy(orderFunc, naturalStringComparer);
-                        }
-                        else
-                        {
-                            ordered = listToSort.OrderByDescending(orderFunc, naturalStringComparer);
-                        }
+                        ordered = listToSort.OrderByDescending(orderFunc, naturalStringComparer);
                     }
                     else
                     {
-                        if (AppSettings.ListAndSortDirectoriesAlongsideFiles)
-                        {
-                            ordered = listToSort.OrderByDescending(orderFunc);
-                        }
-                        else
-                        {
-                            ordered = listToSort.OrderBy(folderThenFileAsync).ThenByDescending(orderFunc);
-                        }
+                        ordered = listToSort.OrderByDescending(folderThenFileAsync).ThenByDescending(orderFunc, naturalStringComparer);
                     }
                 }
                 else
                 {
-                    if (FolderSettings.DirectorySortOption == SortOption.Name)
+                    if (AppSettings.ListAndSortDirectoriesAlongsideFiles)
                     {
-                        if (AppSettings.ListAndSortDirectoriesAlongsideFiles)
-                        {
-                            ordered = listToSort.OrderByDescending(orderFunc, naturalStringComparer);
-                        }
-                        else
-                        {
-                            ordered = listToSort.OrderByDescending(folderThenFileAsync).ThenByDescending(orderFunc, naturalStringComparer);
-                        }
+                        ordered = listToSort.OrderByDescending(orderFunc);
                     }
                     else
                     {
-                        if (AppSettings.ListAndSortDirectoriesAlongsideFiles)
-                        {
-                            ordered = listToSort.OrderByDescending(orderFunc);
-                        }
-                        else
-                        {
-                            ordered = listToSort.OrderByDescending(folderThenFileAsync).ThenByDescending(orderFunc);
-                        }
+                        ordered = listToSort.OrderByDescending(folderThenFileAsync).ThenByDescending(orderFunc);
                     }
                 }
             }