Fixed COM instance leak and error (#62)

shibayan · Jan 9, 2021 · 6536679 · 6536679
1 parent 2384365
commit 6536679
Show file tree

Hide file tree

Showing 19 changed files with 224 additions and 172 deletions.
diff --git a/WinQuickLook/Controls/PreviewHandlerHost.cs b/WinQuickLook/Controls/PreviewHandlerHost.cs
@@ -88,38 +88,46 @@ public IPreviewHandler CreatePreviewHandler(string fileName)
                 return null;
             }
 
-            var initializeWithFile = previewHandler.QueryInterface<IInitializeWithFile>();
-
-            if (initializeWithFile != null)
+            try
             {
-                initializeWithFile.Initialize(fileName, 0);
+                var initializeWithFile = previewHandler.QueryInterface<IInitializeWithFile>();
 
-                return previewHandler;
-            }
+                if (initializeWithFile != null)
+                {
+                    initializeWithFile.Initialize(fileName, 0);
 
-            var initializeWithItem = previewHandler.QueryInterface<IInitializeWithItem>();
+                    return previewHandler;
+                }
 
-            if (initializeWithItem != null)
-            {
-                NativeMethods.SHCreateItemFromParsingName(fileName, IntPtr.Zero, typeof(IShellItem).GUID, out var shellItem);
+                var initializeWithItem = previewHandler.QueryInterface<IInitializeWithItem>();
 
-                initializeWithItem.Initialize(shellItem, 0);
+                if (initializeWithItem != null)
+                {
+                    NativeMethods.SHCreateItemFromParsingName(fileName, IntPtr.Zero, typeof(IShellItem).GUID, out var shellItem);
 
-                return previewHandler;
-            }
+                    initializeWithItem.Initialize(shellItem, 0);
 
-            try
-            {
-                previewHandler.Unload();
+                    return previewHandler;
+                }
+
+                var initializeWithStream = previewHandler.QueryInterface<IInitializeWithStream>();
+
+                if (initializeWithStream != null)
+                {
+                    initializeWithStream.Initialize(new ComStream(File.Open(fileName, FileMode.Open, FileAccess.Read)), 0);
+
+                    return previewHandler;
+                }
             }
             catch (Exception ex)
             {
                 Crashes.TrackError(ex);
             }
-            finally
-            {
-                Marshal.FinalReleaseComObject(previewHandler);
-            }
+
+            // 初期化できない場合はアンロードする
+            previewHandler.Unload();
+
+            Marshal.FinalReleaseComObject(previewHandler);
 
             return null;
         }

diff --git a/WinQuickLook/Extensions/QuickLookHandlerExtensions.cs b/WinQuickLook/Extensions/QuickLookHandlerExtensions.cs
@@ -1,5 +1,4 @@
 using System;
-using System.Threading.Tasks;
 using System.Windows;
 
 using Microsoft.AppCenter.Crashes;
@@ -12,18 +11,18 @@ internal static class QuickLookHandlerExtensions
     {
         private static readonly IQuickLookHandler _genericHandler = new GenericQuickLookHandler();
 
-        public static async Task<(FrameworkElement, Size, string)> GetViewerWithErrorAsync(this IQuickLookHandler handler, string fileName)
+        public static (FrameworkElement, Size, string) GetViewerWithHandleError(this IQuickLookHandler handler, string fileName)
         {
             try
             {
-                return await (handler ?? _genericHandler).GetViewerAsync(fileName);
+                return (handler ?? _genericHandler).GetViewer(fileName);
             }
             catch (Exception ex)
             {
                 Crashes.TrackError(ex);
             }
 
-            return await _genericHandler.GetViewerAsync(fileName);
+            return _genericHandler.GetViewer(fileName);
         }
     }
 }
diff --git a/WinQuickLook/Handlers/AnimatedGifQuickLookHandler.cs b/WinQuickLook/Handlers/AnimatedGifQuickLookHandler.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media.Imaging;
@@ -25,7 +24,7 @@ public bool CanOpen(string fileName)
             return bitmap.Frames.Count > 1;
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             using var file = TagLib.File.Create(fileName);
 
@@ -41,8 +40,8 @@ public bool CanOpen(string fileName)
             mediaElement.Source = new Uri(fileName, UriKind.Absolute);
             mediaElement.LoadedBehavior = MediaState.Play;
             mediaElement.UnloadedBehavior = MediaState.Manual;
-            mediaElement.MediaOpened += (_, __) => mediaElement.Play();
-            mediaElement.MediaEnded += (_, __) =>
+            mediaElement.MediaOpened += (_, _) => mediaElement.Play();
+            mediaElement.MediaEnded += (_, _) =>
             {
                 mediaElement.Position = TimeSpan.FromMilliseconds(1);
                 mediaElement.Play();

diff --git a/WinQuickLook/Handlers/AudioQuickLookHandler.cs b/WinQuickLook/Handlers/AudioQuickLookHandler.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 
 using WinQuickLook.Controls;
@@ -18,7 +17,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var requestSize = new Size(600, 300);
 

diff --git a/WinQuickLook/Handlers/ComInteropQuickLookHandler.cs b/WinQuickLook/Handlers/ComInteropQuickLookHandler.cs
@@ -1,6 +1,4 @@
 using System;
-using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms.Integration;
 
@@ -16,7 +14,7 @@ public bool CanOpen(string fileName)
             return PreviewHandlerHost.GetPreviewHandlerCLSID(fileName) != Guid.Empty;
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var requestSize = new Size
             {

diff --git a/WinQuickLook/Handlers/GenericQuickLookHandler.cs b/WinQuickLook/Handlers/GenericQuickLookHandler.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 
 using WinQuickLook.Controls;
@@ -14,7 +13,7 @@ public bool CanOpen(string fileName)
             return true;
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var requestSize = new Size(572, 290);
 

diff --git a/WinQuickLook/Handlers/HtmlQuickLookHandler.cs b/WinQuickLook/Handlers/HtmlQuickLookHandler.cs
@@ -1,7 +1,6 @@
 using System;
 using System.Collections.Generic;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 
@@ -21,7 +20,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var requestSize = new Size
             {

diff --git a/WinQuickLook/Handlers/IQuickLookHandler.cs b/WinQuickLook/Handlers/IQuickLookHandler.cs
@@ -1,12 +1,11 @@
-using System.Threading.Tasks;
-using System.Windows;
+using System.Windows;
 
 namespace WinQuickLook.Handlers
 {
     public interface IQuickLookHandler
     {
         bool CanOpen(string fileName);
 
-        Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName);
+        (FrameworkElement, Size, string) GetViewer(string fileName);
     }
 }
diff --git a/WinQuickLook/Handlers/ImageQuickLookHandler.cs b/WinQuickLook/Handlers/ImageQuickLookHandler.cs
@@ -1,6 +1,5 @@
 using System;
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Windows.Media;
@@ -28,7 +27,7 @@ public bool CanOpen(string fileName)
             }
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var (bitmap, originalSize) = GetImage(fileName);
 

diff --git a/WinQuickLook/Handlers/InternetShortcutQuickLookHandler.cs b/WinQuickLook/Handlers/InternetShortcutQuickLookHandler.cs
@@ -1,9 +1,11 @@
-using System.Collections.Generic;
+using System;
+using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
+using System.Windows.Controls;
 
+using Microsoft.Web.WebView2.Core;
 using Microsoft.Web.WebView2.Wpf;
 
 namespace WinQuickLook.Handlers
@@ -17,9 +19,9 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
-            var content = await File.ReadAllLinesAsync(fileName);
+            var content = File.ReadAllLines(fileName);
 
             var urlEntry = content.FirstOrDefault(x => x.StartsWith("URL"));
 
@@ -36,11 +38,26 @@ public bool CanOpen(string fileName)
                 Height = 900
             };
 
-            var webView2 = new WebView2();
+            try
+            {
+                CoreWebView2Environment.GetAvailableBrowserVersionString();
 
-            webView2.Loaded += (sender, e) => ((WebView2)sender).CoreWebView2.Navigate(url);
+                var webView2 = new WebView2
+                {
+                    Source = new Uri(url)
+                };
 
-            return (webView2, requestSize, url);
+                return (webView2, requestSize, url);
+            }
+            catch (EdgeNotFoundException)
+            {
+                var webBrowser = new WebBrowser
+                {
+                    Source = new Uri(url)
+                };
+
+                return (webBrowser, requestSize, url);
+            }
         }
 
         private static readonly IList<string> _supportFormats = new[]

diff --git a/WinQuickLook/Handlers/PdfQuickLookHandler.cs b/WinQuickLook/Handlers/PdfQuickLookHandler.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Forms.Integration;
 
@@ -19,11 +18,11 @@ public bool CanOpen(string fileName)
             return extension == ".pdf";
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var pdfViewer = new PdfViewer();
 
-            var document = PdfDocument.Load(new MemoryStream(await File.ReadAllBytesAsync(fileName)));
+            var document = PdfDocument.Load(new MemoryStream(File.ReadAllBytes(fileName)));
 
             pdfViewer.Document = document;
 

diff --git a/WinQuickLook/Handlers/SvgQuickLookHandler.cs b/WinQuickLook/Handlers/SvgQuickLookHandler.cs
@@ -2,7 +2,6 @@
 using System.Collections.Generic;
 using System.IO;
 using System.Linq;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Controls;
 using System.Xml.Linq;
@@ -23,7 +22,7 @@ public bool CanOpen(string fileName)
             return _supportFormats.Contains(extension);
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var requestSize = GetScaledImageSize(fileName, 1200);
 

diff --git a/WinQuickLook/Handlers/SyntaxHighlightQuickLookHandler.cs b/WinQuickLook/Handlers/SyntaxHighlightQuickLookHandler.cs
@@ -1,5 +1,4 @@
 using System.IO;
-using System.Threading.Tasks;
 using System.Windows;
 using System.Windows.Media;
 
@@ -22,7 +21,7 @@ public bool CanOpen(string fileName)
             return HighlightingManager.Instance.GetDefinitionByExtension(Path.GetExtension(fileName)) != null;
         }
 
-        public async Task<(FrameworkElement, Size, string)> GetViewerAsync(string fileName)
+        public (FrameworkElement, Size, string) GetViewer(string fileName)
         {
             var requestSize = new Size
             {