Fixed some issues

1. OutOfMemory exception 2. Wrong icon 3. Registry integration
zanybaka · Aug 26, 2020 · 35ff61d · 35ff61d
1 parent 8acdc55
commit 35ff61d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 3 deletions.
diff --git a/build/v2.zip b/build/v2.zip
diff --git a/src/Console.v2/Console.v2.csproj b/src/Console.v2/Console.v2.csproj
@@ -5,7 +5,7 @@
     <TargetFramework>netcoreapp3.1</TargetFramework>
     <AssemblyName>FileLockedBy2</AssemblyName>
     <RootNamespace>FileLockedBy</RootNamespace>
-    <ApplicationIcon>unlock-128.ico</ApplicationIcon>
+    <ApplicationIcon>unlock-64.ico</ApplicationIcon>
   </PropertyGroup>
 
   <ItemGroup>

diff --git a/src/Console.v2/Program.cs b/src/Console.v2/Program.cs
@@ -64,12 +64,14 @@ static void Main(string[] args)
                     int handleCount = information.Count;
                     var process = Process.GetProcessById(info.Process.dwProcessId);
                     var infoEnumerator = ProcessHelper.GetCurrentProcessOpenFilesEnumerator(info.Process.dwProcessId, sptr, handleCount);
-                    while (infoEnumerator.MoveNext())
+                    bool skip = false;
+                    while (infoEnumerator.MoveNext() && !skip)
                     {
                         FileHandleInfo current = infoEnumerator.Current;
                         if (string.Compare(path, current.FileSystemInfo.FullName, StringComparison.OrdinalIgnoreCase) != 0) continue;
                         Console.WriteLine($"Found! {process.ProcessName} -> {process.MainModule.FileName}");
                         found = true;
+                        skip = true;
                         var result = ProcessHelper.CloseHandle(process, current, currentProcess);
                         Console.WriteLine(result == 0 ? "Success." : $"Error: {Enum.GetName(typeof(Error), result)}");
                     }

diff --git a/src/Console.v2/Registry/ExplorerIntegration.cs b/src/Console.v2/Registry/ExplorerIntegration.cs
@@ -13,7 +13,9 @@ public static void RegisterMenuItem(string app, string path)
                 throw new NotSupportedException("The platform is not supported.");
             }
 
-            RegistryKey shell = Microsoft.Win32.Registry.CurrentUser.OpenSubKey("Software\\Classes\\*\\shell", writable: true);
+            RegistryKey classes = Microsoft.Win32.Registry.CurrentUser.OpenSubKey("Software\\Classes", writable: true);
+            RegistryKey asterisk = classes.OpenSubKey("*", writable: true) ?? classes.CreateSubKey("*");
+            RegistryKey shell = asterisk.OpenSubKey("shell", writable: true) ?? asterisk.CreateSubKey("shell");
             RegistryKey unlock = shell.CreateSubKey(app, writable: true);
             unlock.SetValue("Icon", $"\"{path}\"");
             RegistryKey command = unlock.CreateSubKey("command");