Fixed COM instance leak (#24)

shibayan · Apr 2, 2020 · 749237f · 749237f
1 parent f055f14
commit 749237f
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 21 deletions.
diff --git a/WinQuickLook/Controls/PreviewHandlerHost.cs b/WinQuickLook/Controls/PreviewHandlerHost.cs
@@ -38,31 +38,30 @@ public static Guid GetPreviewHandlerCLSID(string fileName)
                 return Guid.Empty;
             }
 
-            using (var extensionKey = Registry.ClassesRoot.OpenSubKey(extension))
-            {
-                if (extensionKey == null)
-                {
-                    return Guid.Empty;
-                }
+            using var extensionKey = Registry.ClassesRoot.OpenSubKey(extension);
 
-                var subKey = extensionKey.OpenSubKey(PreviewHandlerSubKey);
+            if (extensionKey == null)
+            {
+                return Guid.Empty;
+            }
 
-                if (subKey != null)
-                {
-                    return new Guid(Convert.ToString(subKey.GetValue(null)));
-                }
+            using var previewHandlerSubKey = extensionKey.OpenSubKey(PreviewHandlerSubKey);
 
-                var className = Convert.ToString(extensionKey.GetValue(null));
+            if (previewHandlerSubKey != null)
+            {
+                return new Guid(Convert.ToString(previewHandlerSubKey.GetValue(null)));
+            }
 
-                subKey = Registry.ClassesRoot.OpenSubKey(className + PreviewHandlerSubKey);
+            var className = Convert.ToString(extensionKey.GetValue(null));
 
-                if (subKey != null)
-                {
-                    return new Guid(Convert.ToString(subKey.GetValue(null)));
-                }
+            using var classNameSubKey = Registry.ClassesRoot.OpenSubKey(className + PreviewHandlerSubKey);
 
-                return Guid.Empty;
+            if (classNameSubKey != null)
+            {
+                return new Guid(Convert.ToString(classNameSubKey.GetValue(null)));
             }
+
+            return Guid.Empty;
         }
 
         public bool Open(string fileName)

diff --git a/WinQuickLook/Handlers/PreviewHandlerBase.cs b/WinQuickLook/Handlers/PreviewHandlerBase.cs
@@ -25,8 +25,8 @@ protected static BitmapSource GetThumbnail(string fileName)
 
             NativeMethods.DeleteObject(bitmap);
 
-            Marshal.ReleaseComObject(imageFactory);
-            Marshal.ReleaseComObject(shellItem);
+            Marshal.FinalReleaseComObject(imageFactory);
+            Marshal.FinalReleaseComObject(shellItem);
 
             return image;
         }

diff --git a/WinQuickLook/Interop/WinExplorerHelper.cs b/WinQuickLook/Interop/WinExplorerHelper.cs
@@ -112,7 +112,7 @@ public static string GetSelectedItem()
 
         private static string GetSelectedItemCore(IWebBrowserApp webBrowserApp)
         {
-            var serviceProvider = webBrowserApp.QueryInterface<Interop.IServiceProvider>();
+            var serviceProvider = webBrowserApp.QueryInterface<IServiceProvider>();
 
             var shellBrowser = serviceProvider.QueryService<IShellBrowser>(SID.STopLevelBrowser);