#627: a new app icon 🎉

Update GitHub API key

.appveyor.yml

@@ -1,15 +1,28 @@
 version: '{build}'
-image: Visual Studio 2017
+branches:
+  only:
+  - master
+skip_branch_with_pr: true
+image: Visual Studio 2019
 configuration: Release
 platform: Any CPU
+clone_script:
+- cmd: >-
+    git clone -q --branch=%APPVEYOR_REPO_BRANCH% https://github.com/%APPVEYOR_REPO_NAME%.git %APPVEYOR_BUILD_FOLDER%
+    
+    cd %APPVEYOR_BUILD_FOLDER%
+    
+    git checkout -qf %APPVEYOR_REPO_COMMIT%
+    
+    git submodule update --init --recursive
 cache:
 - packages -> **\packages.config
 - '%USERPROFILE%\.nuget\packages -> **\project.json'
 before_build:
 - ps: >-
     $env:GIT_TAG = git describe --always --tags
-
-    nuget restore
+    
+    nuget restore -verbosity detailed
 build:
   verbosity: minimal
 after_build:
@@ -25,3 +38,12 @@ artifacts:
   name: QuickLook-%GIT_TAG%
 - path: QuickLook-%GIT_TAG%.msi
   name: QuickLook-%GIT_TAG%
+deploy:
+- provider: GitHub
+  auth_token:
+    secure: 5CSvkfKBq9kUho529L1tkH5ywQQFJY/A8Y6lNoHGJFi7mnSqQAaoiVPbUVU4a/KC
+  artifact: QuickLook-$(APPVEYOR_REPO_TAG_NAME)
+  draft: true
+  on:
+    branch: master
+    APPVEYOR_REPO_TAG: true

.github/ISSUE_TEMPLATE/bug_report.md

@@ -0,0 +1,29 @@
+---
+name: Report a bug
+about: Please follow this template or your issue will be closed
+
+---
+
+*For all's convenience, please use English to fill this issue.*
+
+*Please search within existing issues before the submission. Has this issue already been reported?*
+
+**Describe the bug**
+A clear and concise description of what the bug is.
+
+**To Reproduce**
+Steps to reproduce the behavior:
+1. Go to '...'
+2. Click on '....'
+3. Scroll down to '....'
+4. See error
+
+**Expected behavior**
+A clear and concise description of what you expected to happen.
+
+**Desktop (please complete the following information):**
+ - OS Version: [e.g. Windows 10 1803]
+ - QuickLook Version: [e.g. 0.3.3 from Windows Store]
+
+**Screenshots and Exception Log**
+If applicable, add screenshots and logs to help explain your problem. The log file is located in `%APPDATA%\pooi.moe\QuickLook\QuickLook.Exception.log` (`.msi` or `.zip` version) or `%LOCALAPPDATA%\Packages\21090PaddyXu.QuickLook_egxr34yet59cg\LocalCache\Roaming\pooi.moe\QuickLook\QuickLook.Exception.log` (Windows Store version).

.github/ISSUE_TEMPLATE/feature_request.md

@@ -0,0 +1,19 @@
+---
+name: Suggest a new idea
+about: Please follow this template or your issue will be closed
+
+---
+
+*For all's convenience, please use English to fill this issue.*
+
+**Is your feature request related to a problem? Please describe.**
+A clear and concise description of what the problem is. Ex. I'm always frustrated when [...]
+
+**Describe the solution you'd like**
+A clear and concise description of what you want to happen.
+
+**Describe alternatives you've considered**
+A clear and concise description of any alternative solutions or features you've considered.
+
+**Additional context**
+Add any other context or screenshots about the feature request here.

.gitignore

@@ -17,8 +17,6 @@
 [Dd]ebugPublic/
 [Rr]elease/
 [Rr]eleases/
-x64/
-x86/
 bld/
 [Bb]in/
 [Oo]bj/
@@ -290,4 +288,8 @@ __pycache__/
 /QuickLook.Plugin.PDFViewer/MoonPdfLib
 /GitVersion.cs
 /QuickLook.Installer/C_QuickLookComponents.wxs
-/Build/
+/Build/*
+!/Build/Assets
+!/Build/AppxManifest.*
+!/Build/assetslayout.resfiles
+!/Build/priconfig.xml

.gitmodules

@@ -0,0 +1,3 @@
+[submodule "QuickLook.Common"]
+	path = QuickLook.Common
+	url = https://github.com/QL-Win/QuickLook.Common.git

Build/AppxManifest.dev.xml

@@ -0,0 +1,53 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" 
+         xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" 
+         xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" 
+         xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10">
+  <Identity Name="21090PaddyXu.QuickLook" Version="0.0.0.0" 
+            Publisher='E=xupaddy@gmail.com, CN="Open Source Developer, Pengfei Xu", O=Open Source Developer, C=FI' />
+  <Properties>
+    <DisplayName>QuickLook</DisplayName>
+    <PublisherDisplayName>Paddy Xu</PublisherDisplayName>
+    <Description>Bring macOS &#8220;Quick Look&#8221; feature to Windows</Description>
+    <Logo>Assets\storelogo.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="en-us" />
+    <Resource uap:Scale="100" />
+    <Resource uap:Scale="125" />
+    <Resource uap:Scale="150" />
+    <Resource uap:Scale="200" />
+    <Resource uap:Scale="400" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.15063.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+  <Applications>
+    <Application Id="Main" Executable="Package\QuickLook.exe" EntryPoint="Windows.FullTrustApplication">
+      <Extensions>
+        <desktop:Extension Category="windows.startupTask" Executable="Package\QuickLook.exe" 
+                           EntryPoint="Windows.FullTrustApplication">
+          <desktop:StartupTask TaskId="QuickLookTask" Enabled="true" DisplayName="QuickLook" />
+        </desktop:Extension>
+      </Extensions>
+      <uap:VisualElements DisplayName="QuickLook" 
+                          Description="Bring macOS &#8220;Quick Look&#8221; feature to Windows" 
+                          BackgroundColor="transparent" 
+                          Square150x150Logo="Assets\Square150x150Logo.png" 
+                          Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" 
+                         Square310x310Logo="Assets\LargeTile.png" 
+                         Square71x71Logo="Assets\SmallTile.png">
+          <uap:ShowNameOnTiles>
+            <uap:ShowOn Tile="square150x150Logo" />
+            <uap:ShowOn Tile="wide310x150Logo" />
+            <uap:ShowOn Tile="square310x310Logo" />
+          </uap:ShowNameOnTiles>
+        </uap:DefaultTile>
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+</Package>

Build/AppxManifest.xml

@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Package xmlns="http://schemas.microsoft.com/appx/manifest/foundation/windows10" 
+         xmlns:desktop="http://schemas.microsoft.com/appx/manifest/desktop/windows10" 
+         xmlns:rescap="http://schemas.microsoft.com/appx/manifest/foundation/windows10/restrictedcapabilities" 
+         xmlns:uap="http://schemas.microsoft.com/appx/manifest/uap/windows10">
+  <Identity Name="21090PaddyXu.QuickLook" Version="0.0.0.0" Publisher="CN=CE36AF3D-FF94-43EB-9908-7EC8FD1D29FB" />
+  <Properties>
+    <DisplayName>QuickLook</DisplayName>
+    <PublisherDisplayName>Paddy Xu</PublisherDisplayName>
+    <Description>Bring macOS &#8220;Quick Look&#8221; feature to Windows</Description>
+    <Logo>Assets\storelogo.png</Logo>
+  </Properties>
+  <Resources>
+    <Resource Language="en-us" />
+    <Resource uap:Scale="100" />
+    <Resource uap:Scale="125" />
+    <Resource uap:Scale="150" />
+    <Resource uap:Scale="200" />
+    <Resource uap:Scale="400" />
+  </Resources>
+  <Dependencies>
+    <TargetDeviceFamily Name="Windows.Desktop" MinVersion="10.0.14316.0" MaxVersionTested="10.0.15063.0" />
+  </Dependencies>
+  <Capabilities>
+    <rescap:Capability Name="runFullTrust" />
+  </Capabilities>
+  <Applications>
+    <Application Id="Main" Executable="Package\QuickLook.exe" EntryPoint="Windows.FullTrustApplication">
+      <Extensions>
+        <desktop:Extension Category="windows.startupTask" Executable="Package\QuickLook.exe" 
+                           EntryPoint="Windows.FullTrustApplication">
+          <desktop:StartupTask TaskId="QuickLookTask" Enabled="true" DisplayName="QuickLook" />
+        </desktop:Extension>
+      </Extensions>
+      <uap:VisualElements DisplayName="QuickLook" 
+                          Description="Bring macOS &#8220;Quick Look&#8221; feature to Windows" 
+                          BackgroundColor="transparent" 
+                          Square150x150Logo="Assets\Square150x150Logo.png" 
+                          Square44x44Logo="Assets\Square44x44Logo.png">
+        <uap:DefaultTile Wide310x150Logo="Assets\Wide310x150Logo.png" 
+                         Square310x310Logo="Assets\LargeTile.png" 
+                         Square71x71Logo="Assets\SmallTile.png">
+          <uap:ShowNameOnTiles>
+            <uap:ShowOn Tile="square150x150Logo" />
+            <uap:ShowOn Tile="wide310x150Logo" />
+            <uap:ShowOn Tile="square310x310Logo" />
+          </uap:ShowNameOnTiles>
+        </uap:DefaultTile>
+      </uap:VisualElements>
+    </Application>
+  </Applications>
+</Package>

Build/assetslayout.resfiles

@@ -0,0 +1,40 @@
+Assets\LargeTile.scale-100.png
+Assets\LargeTile.scale-125.png
+Assets\LargeTile.scale-150.png
+Assets\LargeTile.scale-200.png
+Assets\LargeTile.scale-400.png
+Assets\SmallTile.scale-100.png
+Assets\SmallTile.scale-125.png
+Assets\SmallTile.scale-150.png
+Assets\SmallTile.scale-200.png
+Assets\SmallTile.scale-400.png
+Assets\Square150x150Logo.scale-100.png
+Assets\Square150x150Logo.scale-125.png
+Assets\Square150x150Logo.scale-150.png
+Assets\Square150x150Logo.scale-200.png
+Assets\Square150x150Logo.scale-400.png
+Assets\Square44x44Logo.altform-unplated_targetsize-16.png
+Assets\Square44x44Logo.altform-unplated_targetsize-24.png
+Assets\Square44x44Logo.altform-unplated_targetsize-32.png
+Assets\Square44x44Logo.altform-unplated_targetsize-48.png
+Assets\Square44x44Logo.altform-unplated_targetsize-256.png
+Assets\Square44x44Logo.scale-100.png
+Assets\Square44x44Logo.scale-125.png
+Assets\Square44x44Logo.scale-150.png
+Assets\Square44x44Logo.scale-200.png
+Assets\Square44x44Logo.scale-400.png
+Assets\Square44x44Logo.targetsize-16.png
+Assets\Square44x44Logo.targetsize-24.png
+Assets\Square44x44Logo.targetsize-32.png
+Assets\Square44x44Logo.targetsize-48.png
+Assets\Square44x44Logo.targetsize-256.png
+Assets\storelogo.scale-100.png
+Assets\storelogo.scale-125.png
+Assets\storelogo.scale-150.png
+Assets\storelogo.scale-200.png
+Assets\storelogo.scale-400.png
+Assets\Wide310x150Logo.scale-100.png
+Assets\Wide310x150Logo.scale-125.png
+Assets\Wide310x150Logo.scale-150.png
+Assets\Wide310x150Logo.scale-200.png
+Assets\Wide310x150Logo.scale-400.png

Build/priconfig.xml

@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<resources targetOsVersion="10.0.0" majorVersion="1">
+  <index root="\" startIndexAt="..\assetslayout.resfiles">
+    <default>
+      <qualifier name="Language" value="en-US" />
+      <qualifier name="Contrast" value="standard" />
+      <qualifier name="Scale" value="100" />
+      <qualifier name="HomeRegion" value="001" />
+      <qualifier name="TargetSize" value="256" />
+      <qualifier name="LayoutDirection" value="LTR" />
+      <qualifier name="Configuration" value="" />
+      <qualifier name="AlternateForm" value="" />
+      <qualifier name="DXFeatureLevel" value="DX9" />
+      <qualifier name="Platform" value="UAP" />
+    </default>
+    <indexer-config type="RESFILES" qualifierDelimiter="." />
+  </index>
+</resources>

QuickLook.Installer/Product.wxs

@@ -31,7 +31,7 @@
           <RemoveFolder Id="ProgramMenuFolder" On="uninstall" />
           <RegistryValue
             Root="HKCU"
-            Key="Software/QuickLook"
+            Key="Software\QuickLook"
             Name="installed"
             Type="integer"
             Value="1"
@@ -48,7 +48,7 @@
           <RemoveFolder Id="DesktopFolder" On="uninstall" />
           <RegistryValue
             Root="HKCU"
-            Key="Software/QuickLook"
+            Key="Software\QuickLook"
             Name="installed"
             Type="integer"
             Value="1"

QuickLook.Installer/QuickLook.Installer.wixproj

@@ -8,16 +8,14 @@
     <SchemaVersion>2.0</SchemaVersion>
     <OutputName>QuickLook</OutputName>
     <OutputType>Package</OutputType>
-  </PropertyGroup>
-  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <OutputPath>..\Build\</OutputPath>
     <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
+  </PropertyGroup>
+  <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Debug|x86' ">
     <DefineConstants>Debug</DefineConstants>
     <SuppressPdbOutput>True</SuppressPdbOutput>
   </PropertyGroup>
   <PropertyGroup Condition=" '$(Configuration)|$(Platform)' == 'Release|x86' ">
-    <OutputPath>..\Build\</OutputPath>
-    <IntermediateOutputPath>obj\$(Configuration)\</IntermediateOutputPath>
     <DefineConstants>PackageDir=$(SolutionDir)Build\Package\</DefineConstants>
   </PropertyGroup>
   <ItemGroup>
@@ -39,20 +37,16 @@
     <Error Text="The WiX Toolset v3.11 (or newer) build tools must be installed to build this project. To download the WiX Toolset, see http://wixtoolset.org/releases/" />
   </Target>
   <PropertyGroup>
-    <PreBuildEvent>rmdir /S /Q "$(SolutionDir)Build\Package\%2a"
+    <PostBuildEvent>powershell -file "$(SolutionDir)Scripts\rename-msi.ps1"
+
+powershell -file "$(SolutionDir)Scripts\pack-zip.ps1"</PostBuildEvent>
+  </PropertyGroup>
+  <PropertyGroup>
+    <PreBuildEvent>rmdir /S /Q "$(SolutionDir)Build\Package"
 
 robocopy "$(SolutionDir)Build\$(Configuration)" "$(SolutionDir)Build\Package" %2a.%2a /e /njh /njs /ndl /nfl /nc /ns /np /xf %2a.pdb /xf %2a.obj /xf %2a.ipdb /xf %2a.iobj /xf %2a.exp /xf %2a.lib /xf %2a.ilk /xf %2a.xml
 
-powershell -file "$(SolutionDir)Scripts\sign-package.ps1"
-
 "$(WIX)bin\heat" dir "$(SolutionDir)Build\Package" -dr INSTALLFOLDER -cg QuickLookComponents -gg -g1 -sf -srd -sreg -var "var.PackageDir" -out "$(ProjectDir)C_QuickLookComponents.wxs"</PreBuildEvent>
-  </PropertyGroup>
-  <PropertyGroup>
-    <PostBuildEvent>powershell -file "$(SolutionDir)Scripts\sign-msi.ps1"
-
-powershell -file "$(SolutionDir)Scripts\rename-msi.ps1"
-
-powershell -file "$(SolutionDir)Scripts\pack-zip.ps1"</PostBuildEvent>
   </PropertyGroup>
   <!--
 	To modify your build process, add your task inside one of the targets below and uncomment it.

QuickLook.Native/QuickLook.Native32/DOpus.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -62,10 +62,11 @@ void DOpus::GetSelected(PWCHAR buffer)
 	PWCHAR data = DOPUS_IPC_LP_DATA;
 	COPYDATASTRUCT cds;
 	cds.dwData = DOPUS_IPC_LP_INFO;
-	cds.cbData = (wcslen(data) + 1) * sizeof WCHAR;
+	cds.cbData = static_cast<DWORD>(wcslen(data) + 1) * sizeof WCHAR;
 	cds.lpData = data;
 
-	auto ret = SendMessage(FindWindow(DOPUS_CLASS, DOPUS_NAME), WM_COPYDATA, (WPARAM)hMsgWnd, (LPARAM)&cds);
+	auto ret = SendMessage(FindWindow(DOPUS_CLASS, DOPUS_NAME), WM_COPYDATA, reinterpret_cast<WPARAM>(hMsgWnd),
+	                       reinterpret_cast<LPARAM>(&cds));
 	if (!ret)
 		return;
 
@@ -111,7 +112,7 @@ void DOpus::ParseXmlBuffer(PWCHAR buffer)
 
 void DOpus::PrepareMessageWindow()
 {
-	WNDCLASSEX wx = {'\0'};
+	WNDCLASSEX wx = {sizeof wx};
 	wx.cbSize = sizeof(WNDCLASSEX);
 	wx.lpfnWndProc = msgWindowProc;
 	wx.lpszClassName = MSGWINDOW_CLASS;

QuickLook.Native/QuickLook.Native32/DOpus.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/DialogHook.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -99,7 +99,8 @@ void DialogHook::GetSelectedFromWoW64HookHelper(PWCHAR buffer)
 	if (hHelperWnd == nullptr)
 		return;
 
-	auto hMapFile = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, MAX_PATH * sizeof WCHAR, SHARED_MEM_NAME);
+	auto hMapFile = CreateFileMapping(INVALID_HANDLE_VALUE, nullptr, PAGE_READWRITE, 0, MAX_PATH * sizeof WCHAR,
+	                                  SHARED_MEM_NAME);
 	if (hMapFile == nullptr)
 		return;
 

QuickLook.Native/QuickLook.Native32/DialogHook.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/DllExport.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/Everything.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/Everything.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/HelperMethods.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -42,7 +42,7 @@ void HelperMethods::GetSelectedInternal(CComQIPtr<IWebBrowserApp> pwba, PWCHAR b
 void HelperMethods::ObtainFirstItem(CComPtr<IDataObject> dao, PWCHAR buffer)
 {
 	FORMATETC formatetc;
-	STGMEDIUM medium;
+	STGMEDIUM medium = {sizeof medium};
 
 	formatetc.cfFormat = CF_HDROP;
 	formatetc.ptd = nullptr;
@@ -63,18 +63,44 @@ void HelperMethods::ObtainFirstItem(CComPtr<IDataObject> dao, PWCHAR buffer)
 	DragQueryFile(HDROP(medium.hGlobal), 0, buffer, MAX_PATH - 1);
 }
 
+bool HelperMethods::IsListaryToolbarVisible()
+{
+	auto CALLBACK findListaryWindowProc = [](__in HWND hwnd, __in LPARAM lParam)-> BOOL
+	{
+		WCHAR classBuffer[MAX_PATH] = {'\0'};
+		if (FAILED(GetClassName(hwnd, classBuffer, MAX_PATH)))
+			return TRUE;
+
+		if (wcsncmp(classBuffer, L"Listary_WidgetWin_", 18) == 0)
+		{
+			if (IsWindowVisible(hwnd))
+			{
+				*reinterpret_cast<bool*>(lParam) = true;
+				return FALSE;
+			}
+		}
+		return TRUE;
+	};
+
+	auto found = false;
+	EnumWindows(findListaryWindowProc, reinterpret_cast<LPARAM>(&found));
+
+	return found;
+}
+
 bool HelperMethods::IsCursorActivated(HWND hwnd)
 {
 	auto tId = GetWindowThreadProcessId(hwnd, nullptr);
 
 	GUITHREADINFO gui = {sizeof gui};
 	GetGUIThreadInfo(tId, &gui);
-	return gui.flags || gui.hwndCaret;
+	return gui.flags || gui.hwndCaret || IsListaryToolbarVisible();
 }
 
 bool HelperMethods::IsUWP()
 {
-	auto pGCPFN = decltype(&GetCurrentPackageFullName)(GetProcAddress(GetModuleHandle(L"kernel32.dll"), "GetCurrentPackageFullName"));
+	auto pGCPFN = decltype(&GetCurrentPackageFullName)(
+		GetProcAddress(GetModuleHandle(L"kernel32.dll"), "GetCurrentPackageFullName"));
 
 	if (!pGCPFN)
 		return false;

QuickLook.Native/QuickLook.Native32/HelperMethods.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -23,4 +23,7 @@ public:
 	static void ObtainFirstItem(CComPtr<IDataObject> dao, PWCHAR buffer);
 	static bool IsCursorActivated(HWND hwndfg);
 	static bool HelperMethods::IsUWP();
+
+private:
+	static bool IsListaryToolbarVisible();
 };

QuickLook.Native/QuickLook.Native32/QuickLook.Native32.vcxproj

@@ -15,20 +15,20 @@
     <ProjectGuid>{D31EE321-C2B0-4984-B749-736F7DE509F1}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>QuickLookNative32</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>QuickLook.Native32</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

QuickLook.Native/QuickLook.Native32/Shell32.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -40,7 +40,7 @@ Shell32::FocusedWindowType Shell32::GetFocusedWindowType()
 	{
 		return DOPUS;
 	}
-	if (wcscmp(classBuffer, L"EVERYTHING") == 0)
+	if (wcscmp(classBuffer, L"EVERYTHING") == 0 || wcscmp(classBuffer, L"EVERYTHING_SHELL_EXECUTE") == 0)
 	{
 		return EVERYTHING;
 	}
@@ -106,12 +106,12 @@ void Shell32::getSelectedFromExplorer(PWCHAR buffer)
 	for (auto i = 0; i < count; i++)
 	{
 		VARIANT vi;
+		VariantInit(&vi);
 		V_VT(&vi) = VT_I4;
 		V_I4(&vi) = i;
 
 		CComPtr<IDispatch> pdisp;
-		// ReSharper disable once CppSomeObjectMembersMightNotBeInitialized
-		if (FAILED(psw->Item(vi, &pdisp)))
+		if (S_OK != psw->Item(vi, &pdisp))
 			continue;
 
 		CComQIPtr<IWebBrowserApp> pwba;
@@ -139,9 +139,11 @@ void Shell32::getSelectedFromDesktop(PWCHAR buffer)
 	if (FAILED(psw.CoCreateInstance(CLSID_ShellWindows)))
 		return;
 
-	VARIANT pvarLoc = {VT_EMPTY};
+	VARIANT pvarLoc;
+	VariantInit(&pvarLoc);
 	long phwnd;
-	if (FAILED(psw->FindWindowSW(&pvarLoc, &pvarLoc, SWC_DESKTOP, &phwnd, SWFO_NEEDDISPATCH, reinterpret_cast<IDispatch**>(&pwba))))
+	if (FAILED(psw->FindWindowSW(&pvarLoc, &pvarLoc, SWC_DESKTOP, &phwnd, SWFO_NEEDDISPATCH, reinterpret_cast<IDispatch**>(
+		&pwba))))
 		return;
 
 	if (HelperMethods::IsCursorActivated(reinterpret_cast<HWND>(LongToHandle(phwnd))))

QuickLook.Native/QuickLook.Native32/Shell32.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/WoW64HookHelper.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -51,7 +51,7 @@ bool WoW64HookHelper::Launch()
 	auto p = wcsrchr(fullPath, L'\\');
 	memcpy(p, HELPER_FILE, wcslen(HELPER_FILE) * sizeof WCHAR);
 
-	STARTUPINFO si = {'\0'};
+	STARTUPINFO si = {sizeof si};
 	PROCESS_INFORMATION pi = {nullptr};
 	si.cb = sizeof si;
 
@@ -70,10 +70,11 @@ void WoW64HookHelper::createJob()
 
 	hJob = CreateJobObject(nullptr, nullptr);
 
-	JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation = {'\0'};
+	JOBOBJECT_BASIC_LIMIT_INFORMATION BasicLimitInformation = {sizeof BasicLimitInformation};
 	BasicLimitInformation.LimitFlags = JOB_OBJECT_LIMIT_KILL_ON_JOB_CLOSE;
-	JOBOBJECT_EXTENDED_LIMIT_INFORMATION lpJobObjectInfo = {'\0'};
+	JOBOBJECT_EXTENDED_LIMIT_INFORMATION lpJobObjectInfo = {sizeof lpJobObjectInfo};
 	lpJobObjectInfo.BasicLimitInformation = BasicLimitInformation;
 
-	SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &lpJobObjectInfo, sizeof JOBOBJECT_EXTENDED_LIMIT_INFORMATION);
+	SetInformationJobObject(hJob, JobObjectExtendedLimitInformation, &lpJobObjectInfo,
+	                        sizeof JOBOBJECT_EXTENDED_LIMIT_INFORMATION);
 }

QuickLook.Native/QuickLook.Native32/WoW64HookHelper.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/dllmain.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/stdafx.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/stdafx.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native32/targetver.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.Native64/QuickLook.Native64.vcxproj

@@ -35,20 +35,20 @@
     <VCProjectVersion>15.0</VCProjectVersion>
     <ProjectGuid>{794E4DCF-F715-4836-9D30-ABD296586D23}</ProjectGuid>
     <RootNamespace>QuickLookNative64</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>QuickLook.Native64</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|x64'" Label="Configuration">
     <ConfigurationType>DynamicLibrary</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

QuickLook.Native/QuickLook.WoW64HookHelper/QuickLook.WoW64HookHelper.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -34,9 +34,9 @@ HWND hMsgWindow = nullptr;
 UINT WM_HOOK_NOTIFY = 0;
 
 int APIENTRY wWinMain(_In_ HINSTANCE hInstance,
-                           _In_opt_ HINSTANCE hPrevInstance,
-                           _In_ LPWSTR lpCmdLine,
-                           _In_ int nCmdShow)
+                           _In_opt_                           HINSTANCE hPrevInstance,
+                           _In_                           LPWSTR lpCmdLine,
+                           _In_                           int nCmdShow)
 {
 	// do not run when double-clicking
 	if (wcsstr(GetCommandLine(), RUN_ARG) == nullptr)

QuickLook.Native/QuickLook.WoW64HookHelper/QuickLook.WoW64HookHelper.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.WoW64HookHelper/QuickLook.WoW64HookHelper.vcxproj

@@ -15,20 +15,20 @@
     <ProjectGuid>{2C58F9B2-D8FA-4586-942B-5170CECE5963}</ProjectGuid>
     <Keyword>Win32Proj</Keyword>
     <RootNamespace>QuickLookWoW64HookHelper</RootNamespace>
-    <WindowsTargetPlatformVersion>10.0.15063.0</WindowsTargetPlatformVersion>
+    <WindowsTargetPlatformVersion>10.0</WindowsTargetPlatformVersion>
     <ProjectName>QuickLook.WoW64HookHelper</ProjectName>
   </PropertyGroup>
   <Import Project="$(VCTargetsPath)\Microsoft.Cpp.Default.props" />
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>true</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>
   <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|Win32'" Label="Configuration">
     <ConfigurationType>Application</ConfigurationType>
     <UseDebugLibraries>false</UseDebugLibraries>
-    <PlatformToolset>v141</PlatformToolset>
+    <PlatformToolset>v142</PlatformToolset>
     <WholeProgramOptimization>true</WholeProgramOptimization>
     <CharacterSet>Unicode</CharacterSet>
   </PropertyGroup>

QuickLook.Native/QuickLook.WoW64HookHelper/stdafx.cpp

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.WoW64HookHelper/stdafx.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Native/QuickLook.WoW64HookHelper/targetver.h

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileListView.xaml

@@ -90,7 +90,7 @@
 
         <TreeView BorderThickness="0" Focusable="False" Background="Transparent"
                   ScrollViewer.HorizontalScrollBarVisibility="Disabled">
-            <TreeViewItem Focusable="False">
+            <TreeViewItem Focusable="False" Visibility="Collapsed">
                 <TreeViewItem.Header>
                     <Grid ShowGridLines="False">
                         <Grid.ColumnDefinitions>
@@ -130,13 +130,13 @@
 
         <TreeView Grid.Row="1"
                   x:Name="treeView"
-                  BorderThickness="0" Background="Transparent"
+                  BorderThickness="0" Background="Transparent" Foreground="{Binding Foreground, RelativeSource={RelativeSource AncestorType=local:ArchiveFileListView}}"
                   ItemsSource="{Binding}">
-            <!--<TreeView.ItemContainerStyle>
+            <TreeView.ItemContainerStyle>
                 <Style TargetType="{x:Type TreeViewItem}">
-                    <Setter Property="IsExpanded" Value="{Binding Level, Converter={StaticResource LevelToBooleanConverter}}" />
+                    <Setter Property="Foreground" Value="{Binding Foreground, RelativeSource={RelativeSource AncestorType=TreeView}}" />
                 </Style>
-            </TreeView.ItemContainerStyle>-->
+            </TreeView.ItemContainerStyle>
         </TreeView>
     </Grid>
 </UserControl>

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveFileListView.xaml.cs

@@ -37,16 +37,11 @@ namespace QuickLook.Plugin.ArchiveViewer
             IconManager.ClearCache();
         }
 
-        ~ArchiveFileListView()
-        {
-            Dispose();
-        }
-
         public void SetDataContext(object context)
         {
             treeGrid.DataContext = context;
 
-            treeView.Loaded += (sender, e) =>
+            treeView.LayoutUpdated += (sender, e) =>
             {
                 // return when empty
                 if (treeView.Items.Count == 0)

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveInfoPanel.xaml

@@ -7,21 +7,42 @@
              mc:Ignorable="d"
              x:Name="infoPanel"
              d:DesignHeight="600" d:DesignWidth="800">
+    <UserControl.Resources>
+        <ResourceDictionary>
+            <ResourceDictionary.MergedDictionaries>
+                <!-- only for design -->
+                <ResourceDictionary Source="/QuickLook.Common;component/Styles/MainWindowStyles.xaml" />
+            </ResourceDictionary.MergedDictionaries>
+            <local:Percent100ToVisibilityVisibleConverter x:Key="Percent100ToVisibilityVisibleConverter" />
+            <local:Percent100ToVisibilityCollapsedConverter x:Key="Percent100ToVisibilityCollapsedConverter" />
+        </ResourceDictionary>
+    </UserControl.Resources>
     <Grid>
-        <Grid.RowDefinitions>
-            <RowDefinition />
-            <RowDefinition Height="30" />
-        </Grid.RowDefinitions>
-        <local:ArchiveFileListView Grid.Row="0" x:Name="fileListView" Focusable="False" />
-        <Grid Grid.Row="1">
-            <Grid.ColumnDefinitions>
-                <ColumnDefinition Width="40*" />
-                <ColumnDefinition Width="30*" />
-                <ColumnDefinition Width="30*" />
-            </Grid.ColumnDefinitions>
-            <Label x:Name="archiveCount" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center">9 folders and 10 files, solid, password-protected</Label>
-            <Label x:Name="archiveSizeC" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center">Compressed size 9999 bytes</Label>
-            <Label x:Name="archiveSizeU" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center">Uncompressed size 99999 bytes</Label>
+        <Grid ZIndex="9999"
+              Visibility="{Binding ElementName=infoPanel, Path=LoadPercent, Mode=OneWay, Converter={StaticResource Percent100ToVisibilityCollapsedConverter}}">
+            <StackPanel HorizontalAlignment="Center" VerticalAlignment="Center">
+                <Label x:Name="lblLoading" FontSize="14" HorizontalAlignment="Center" Foreground="{DynamicResource WindowTextForeground}">Loading archive ...</Label>
+                <ProgressBar Height="13" Width="150"
+                             Value="{Binding ElementName=infoPanel, Path=LoadPercent, Mode=OneWay}" />
+            </StackPanel>
+        </Grid>
+        <Grid
+            Visibility="{Binding ElementName=infoPanel, Path=LoadPercent, Mode=OneWay, Converter={StaticResource Percent100ToVisibilityVisibleConverter}}">
+            <Grid.RowDefinitions>
+                <RowDefinition />
+                <RowDefinition Height="30" />
+            </Grid.RowDefinitions>
+            <local:ArchiveFileListView Grid.Row="0" x:Name="fileListView" Focusable="False" Foreground="{DynamicResource WindowTextForeground}" />
+            <Grid Grid.Row="1">
+                <Grid.ColumnDefinitions>
+                    <ColumnDefinition Width="40*" />
+                    <ColumnDefinition Width="30*" />
+                    <ColumnDefinition Width="30*" />
+                </Grid.ColumnDefinitions>
+                <Label x:Name="archiveCount" Grid.Column="0" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource WindowTextForegroundAlternative}">0 folders and 0 files, solid, password-protected</Label>
+                <Label x:Name="archiveSizeC" Grid.Column="1" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource WindowTextForegroundAlternative}">Compressed size 0 bytes</Label>
+                <Label x:Name="archiveSizeU" Grid.Column="2" HorizontalAlignment="Center" VerticalAlignment="Center" Foreground="{DynamicResource WindowTextForegroundAlternative}">Uncompressed size 0 bytes</Label>
+            </Grid>
         </Grid>
     </Grid>
 </UserControl>

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ArchiveInfoPanel.xaml.cs

@@ -17,9 +17,15 @@
 
 using System;
 using System.Collections.Generic;
+using System.ComponentModel;
 using System.IO;
 using System.Linq;
+using System.Runtime.CompilerServices;
+using System.Threading.Tasks;
 using System.Windows.Controls;
+using QuickLook.Common.Annotations;
+using QuickLook.Common.ExtensionMethods;
+using QuickLook.Common.Helpers;
 using SharpCompress.Archives;
 using SharpCompress.Common;
 using SharpCompress.Readers;
@@ -29,9 +35,11 @@ namespace QuickLook.Plugin.ArchiveViewer
     /// <summary>
     ///     Interaction logic for ArchiveInfoPanel.xaml
     /// </summary>
-    public partial class ArchiveInfoPanel : UserControl, IDisposable
+    public partial class ArchiveInfoPanel : UserControl, IDisposable, INotifyPropertyChanged
     {
         private readonly Dictionary<string, ArchiveFileEntry> _fileEntries = new Dictionary<string, ArchiveFileEntry>();
+        private bool _disposed;
+        private double _loadPercent;
         private ulong _totalZippedSize;
         private string _type;
 
@@ -39,57 +47,92 @@ namespace QuickLook.Plugin.ArchiveViewer
         {
             InitializeComponent();
 
-            LoadArchive(path);
+            // design-time only
+            Resources.MergedDictionaries.Clear();
 
-            fileListView.SetDataContext(_fileEntries[""].Children.Keys);
+            BeginLoadArchive(path);
+        }
+
+        public double LoadPercent
+        {
+            get => _loadPercent;
+            private set
+            {
+                if (value == _loadPercent) return;
+                _loadPercent = value;
+                OnPropertyChanged();
+            }
         }
 
         public void Dispose()
         {
             GC.SuppressFinalize(this);
 
-            _fileEntries.Clear();
+            _disposed = true;
+
             fileListView.Dispose();
         }
 
-        ~ArchiveInfoPanel()
+        public event PropertyChangedEventHandler PropertyChanged;
+
+        private void BeginLoadArchive(string path)
         {
-            Dispose();
-        }
-
-        private void LoadArchive(string path)
-        {
-            _totalZippedSize = (ulong) new FileInfo(path).Length;
-
-            LoadItemsFromArchive(path);
-
-            var folders = -1; // do not count root node
-            var files = 0;
-            ulong sizeU = 0L;
-            _fileEntries.ForEach(e =>
+            new Task(() =>
             {
-                if (e.Value.IsFolder)
-                    folders++;
+                _totalZippedSize = (ulong) new FileInfo(path).Length;
+
+                var root = new ArchiveFileEntry(Path.GetFileName(path), true);
+                _fileEntries.Add("", root);
+
+                try
+                {
+                    LoadItemsFromArchive(path);
+                }
+                catch (Exception e)
+                {
+                    ProcessHelper.WriteLog(e.ToString());
+                    Dispatcher.Invoke(() => { lblLoading.Content = "Preview failed. See log for more details."; });
+                    return;
+                }
+
+                var folders = -1; // do not count root node
+                var files = 0;
+                ulong sizeU = 0L;
+                _fileEntries.ForEach(e =>
+                {
+                    if (e.Value.IsFolder)
+                        folders++;
+                    else
+                        files++;
+
+                    sizeU += e.Value.Size;
+                });
+
+                string t;
+                var d = folders != 0 ? $"{folders} folders" : string.Empty;
+                var f = files != 0 ? $"{files} files" : string.Empty;
+                if (!string.IsNullOrEmpty(d) && !string.IsNullOrEmpty(f))
+                    t = $", {d} and {f}";
+                else if (string.IsNullOrEmpty(d) && string.IsNullOrEmpty(f))
+                    t = string.Empty;
                 else
-                    files++;
+                    t = $", {d}{f}";
 
-                sizeU += e.Value.Size;
-            });
+                Dispatcher.Invoke(() =>
+                {
+                    if (_disposed)
+                        return;
 
-            string t;
-            var d = folders != 0 ? $"{folders} folders" : string.Empty;
-            var f = files != 0 ? $"{files} files" : string.Empty;
-            if (!string.IsNullOrEmpty(d) && !string.IsNullOrEmpty(f))
-                t = $", {d} and {f}";
-            else if (string.IsNullOrEmpty(d) && string.IsNullOrEmpty(f))
-                t = string.Empty;
-            else
-                t = $", {d}{f}";
+                    fileListView.SetDataContext(_fileEntries[""].Children.Keys);
+                    archiveCount.Content =
+                        $"{_type} archive{t}";
+                    archiveSizeC.Content =
+                        $"Compressed size {((long) _totalZippedSize).ToPrettySize(2)}";
+                    archiveSizeU.Content = $"Uncompressed size {((long) sizeU).ToPrettySize(2)}";
+                });
 
-            archiveCount.Content =
-                $"{_type} archive{t}";
-            archiveSizeC.Content = $"Compressed size {_totalZippedSize.ToPrettySize(2)}";
-            archiveSizeU.Content = $"Uncompressed size {sizeU.ToPrettySize(2)}";
+                LoadPercent = 100d;
+            }).Start();
         }
 
         private void LoadItemsFromArchive(string path)
@@ -99,29 +142,33 @@ namespace QuickLook.Plugin.ArchiveViewer
                 // ReaderFactory is slow... so limit its usage
                 string[] useReader = {".tar.gz", ".tgz", ".tar.bz2", ".tar.lz", ".tar.xz"};
 
-                if (useReader.Any(i => path.EndsWith(i)))
+                if (useReader.Any(path.ToLower().EndsWith))
                 {
-                    var reader = ReaderFactory.Open(stream);
+                    var reader = ReaderFactory.Open(stream, new ChardetReaderOptions());
 
                     _type = reader.ArchiveType.ToString();
 
-                    var root = new ArchiveFileEntry(Path.GetFileName(path), true);
-                    _fileEntries.Add("", root);
-
                     while (reader.MoveToNextEntry())
+                    {
+                        if (_disposed)
+                            return;
+                        LoadPercent = 100d * stream.Position / stream.Length;
                         ProcessByLevel(reader.Entry);
+                    }
                 }
                 else
                 {
-                    var archive = ArchiveFactory.Open(stream);
+                    var archive = ArchiveFactory.Open(stream, new ChardetReaderOptions());
 
                     _type = archive.Type.ToString();
 
-                    var root = new ArchiveFileEntry(Path.GetFileName(path), true);
-                    _fileEntries.Add("", root);
-
                     foreach (var entry in archive.Entries)
+                    {
+                        if (_disposed)
+                            return;
+                        LoadPercent = 100d * stream.Position / stream.Length;
                         ProcessByLevel(entry);
+                    }
                 }
             }
         }
@@ -138,8 +185,7 @@ namespace QuickLook.Plugin.ArchiveViewer
                     if (_fileEntries.ContainsKey(f))
                         return;
 
-                    ArchiveFileEntry parent;
-                    _fileEntries.TryGetValue(GetDirectoryName(f), out parent);
+                    _fileEntries.TryGetValue(GetDirectoryName(f), out var parent);
 
                     var afe = new ArchiveFileEntry(Path.GetFileName(f), true, parent);
 
@@ -151,8 +197,7 @@ namespace QuickLook.Plugin.ArchiveViewer
             {
                 var file = pf.Last();
 
-                ArchiveFileEntry parent;
-                _fileEntries.TryGetValue(GetDirectoryName(file), out parent);
+                _fileEntries.TryGetValue(GetDirectoryName(file), out var parent);
 
                 _fileEntries.Add(file, new ArchiveFileEntry(Path.GetFileName(entry.Key), false, parent)
                 {
@@ -179,5 +224,11 @@ namespace QuickLook.Plugin.ArchiveViewer
 
             return frags.Select((s, i) => frags.Take(i + 1).Aggregate((a, b) => a + "\\" + b)).ToArray();
         }
+
+        [NotifyPropertyChangedInvocator]
+        protected virtual void OnPropertyChanged([CallerMemberName] string propertyName = null)
+        {
+            PropertyChanged?.Invoke(this, new PropertyChangedEventArgs(propertyName));
+        }
     }
 }

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/ChardetReaderOptions.cs

@@ -16,22 +16,32 @@
 // along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 using System;
+using System.Text;
+using SharpCompress.Common;
+using SharpCompress.Readers;
+using UtfUnknown;
 
-namespace QuickLook.Helpers.BlurLibrary.PlatformsImpl
+namespace QuickLook.Plugin.ArchiveViewer
 {
-    public class OsNotSupportedWindowBlurController : IWindowBlurController
+    internal class ChardetReaderOptions : ReaderOptions
     {
-        public void EnableBlur(IntPtr hwnd)
+        public ChardetReaderOptions()
         {
-            throw new NotSupportedException();
+            ArchiveEncoding = new ArchiveEncoding
+            {
+                CustomDecoder = Chardet
+            };
         }
 
-        public void DisableBlur(IntPtr hwnd)
+        public string Chardet(byte[] bytes, int index, int count)
         {
-            throw new NotSupportedException();
-        }
+            var buffer = new byte[count];
 
-        public bool Enabled { get; } = false;
-        public bool CanBeEnabled { get; } = false;
+            Array.Copy(bytes, index, buffer, 0, count);
+
+            var encoding = CharsetDetector.DetectFromBytes(buffer).Detected?.Encoding ?? Encoding.Default;
+
+            return encoding.GetString(buffer);
+        }
     }
 }

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Converters.cs

@@ -19,9 +19,44 @@ using System;
 using System.Globalization;
 using System.Windows;
 using System.Windows.Data;
+using QuickLook.Common.ExtensionMethods;
 
 namespace QuickLook.Plugin.ArchiveViewer
 {
+    public class Percent100ToVisibilityVisibleConverter : DependencyObject, IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+                value = 0;
+
+            var percent = (double) value;
+            return Math.Abs(percent - 100) < 0.00001 ? Visibility.Visible : Visibility.Collapsed;
+        }
+
+        public object ConvertBack(object value, Type targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
+    public class Percent100ToVisibilityCollapsedConverter : DependencyObject, IValueConverter
+    {
+        public object Convert(object value, Type targetType, object parameter, CultureInfo culture)
+        {
+            if (value == null)
+                value = 0;
+
+            var percent = (double) value;
+            return Math.Abs(percent - 100) < 0.00001 ? Visibility.Collapsed : Visibility.Visible;
+        }
+
+        public object ConvertBack(object value, Type targetTypes, object parameter, CultureInfo culture)
+        {
+            throw new NotImplementedException();
+        }
+    }
+
     public class LevelToIndentConverter : DependencyObject, IMultiValueConverter
     {
         public object Convert(object[] values, Type targetType, object parameter, CultureInfo culture)
@@ -77,7 +112,7 @@ namespace QuickLook.Plugin.ArchiveViewer
             var size = (ulong) values[0];
             var isFolder = (bool) values[1];
 
-            return isFolder ? "" : size.ToPrettySize(2);
+            return isFolder ? "" : ((long) size).ToPrettySize(2);
         }
 
         public object[] ConvertBack(object value, Type[] targetTypes, object parameter, CultureInfo culture)

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Extensions.cs

@@ -47,31 +47,8 @@ namespace QuickLook.Plugin.ArchiveViewer
                 if (foundElement != null)
                     break;
             }
+
             return foundElement;
         }
-
-        public static string ToPrettySize(this ulong value, int decimalPlaces = 0)
-        {
-            const long OneKb = 1024;
-            const long OneMb = OneKb * 1024;
-            const long OneGb = OneMb * 1024;
-            const long OneTb = OneGb * 1024;
-
-            var asTb = Math.Round((double) value / OneTb, decimalPlaces);
-            var asGb = Math.Round((double) value / OneGb, decimalPlaces);
-            var asMb = Math.Round((double) value / OneMb, decimalPlaces);
-            var asKb = Math.Round((double) value / OneKb, decimalPlaces);
-            var chosenValue = asTb > 1
-                ? $"{asTb} TB"
-                : asGb > 1
-                    ? $"{asGb} GB"
-                    : asMb > 1
-                        ? $"{asMb} MB"
-                        : asKb > 1
-                            ? $"{asKb} KB"
-                            : $"{Math.Round((double) value, decimalPlaces)} bytes";
-
-            return chosenValue;
-        }
     }
 }

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/IconManager.cs

@@ -211,8 +211,10 @@ namespace QuickLook.Plugin.ArchiveViewer
                 public readonly IntPtr hIcon;
                 private readonly int iIcon;
                 private readonly uint dwAttributes;
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MaxPath)] private readonly string szDisplayName;
-                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Namesize)] private readonly string szTypeName;
+                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = MaxPath)]
+                private readonly string szDisplayName;
+                [MarshalAs(UnmanagedType.ByValTStr, SizeConst = Namesize)]
+                private readonly string szTypeName;
             }
         }
 

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/Plugin.cs

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -17,16 +17,20 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Windows;
+using QuickLook.Common.Plugin;
 
 namespace QuickLook.Plugin.ArchiveViewer
 {
     public class Plugin : IViewer
     {
+        private static readonly string[] Extensions =
+            {".rar", ".zip", ".tar", ".tgz", ".gz", ".bz2", ".lz", ".xz", ".7z"};
+
         private ArchiveInfoPanel _panel;
 
-        public int Priority => 0;
-        public bool AllowsTransparency => true;
+        public int Priority => -5;
 
         public void Init()
         {
@@ -34,25 +38,7 @@ namespace QuickLook.Plugin.ArchiveViewer
 
         public bool CanHandle(string path)
         {
-            if (Directory.Exists(path))
-                return false;
-
-            switch (Path.GetExtension(path).ToLower())
-            {
-                case ".rar":
-                case ".zip":
-                case ".tar":
-                case ".tgz":
-                case ".gz":
-                case ".bz2":
-                case ".lz":
-                case ".xz":
-                case ".7z":
-                    return true;
-
-                default:
-                    return false;
-            }
+            return !Directory.Exists(path) && Extensions.Any(path.ToLower().EndsWith);
         }
 
         public void Prepare(string path, ContextObject context)
@@ -77,10 +63,5 @@ namespace QuickLook.Plugin.ArchiveViewer
             _panel?.Dispose();
             _panel = null;
         }
-
-        ~Plugin()
-        {
-            Cleanup();
-        }
     }
 }

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/QuickLook.Plugin.ArchiveViewer.csproj

@@ -50,21 +50,25 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
     <Reference Include="PresentationCore" />
     <Reference Include="PresentationFramework" />
-    <Reference Include="SharpCompress, Version=0.17.1.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\SharpCompress.0.17.1\lib\net45\SharpCompress.dll</HintPath>
+    <Reference Include="SharpCompress, Version=0.23.0.0, Culture=neutral, PublicKeyToken=afb0a02973931d96, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\SharpCompress.0.23.0\lib\net45\SharpCompress.dll</HintPath>
     </Reference>
     <Reference Include="System" />
     <Reference Include="System.Core" />
     <Reference Include="System.Drawing" />
     <Reference Include="System.Xaml" />
+    <Reference Include="UtfUnknown, Version=2.0.0.0, Culture=neutral, PublicKeyToken=90217ce7a23260d4, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\UTF.Unknown.2.0.0-rc1\lib\net40\UtfUnknown.dll</HintPath>
+    </Reference>
     <Reference Include="WindowsBase" />
   </ItemGroup>
   <ItemGroup>
@@ -75,6 +79,7 @@
       <DependentUpon>ArchiveInfoPanel.xaml</DependentUpon>
     </Compile>
     <Compile Include="ArchiveFileEntry.cs" />
+    <Compile Include="ChardetReaderOptions.cs" />
     <Compile Include="IconManager.cs" />
     <Compile Include="Extensions.cs" />
     <Compile Include="Converters.cs" />
@@ -85,9 +90,9 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook\QuickLook.csproj">
-      <Project>{8b4a9ce5-67b5-4a94-81cb-3771f688fdeb}</Project>
-      <Name>QuickLook</Name>
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
+      <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
+      <Name>QuickLook.Common</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
@@ -102,7 +107,6 @@
     </Page>
   </ItemGroup>
   <ItemGroup>
-    <None Include="key.snk" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

QuickLook.Plugin/QuickLook.Plugin.ArchiveViewer/packages.config

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
 <packages>
-  <package id="SharpCompress" version="0.17.1" targetFramework="net462" />
+  <package id="SharpCompress" version="0.23.0" targetFramework="net462" />
+  <package id="UTF.Unknown" version="2.0.0-rc1" targetFramework="net462" />
 </packages>

QuickLook.Plugin/QuickLook.Plugin.CsvViewer/CsvViewerPanel.xaml

@@ -9,10 +9,9 @@
              d:DesignHeight="300" d:DesignWidth="300">
     <Grid>
         <DataGrid x:Name="dataGrid" AlternationCount="2" BorderThickness="0" Background="Transparent"
-                  RowBackground="Transparent" GridLinesVisibility="None"
-                  IsReadOnly="True" HeadersVisibility="None"
-                  AutoGenerateColumns="False" CanUserReorderColumns="False"
-                  ItemsSource="{Binding Path=Rows,ElementName=csvViewer}" AlternatingRowBackground="#99ECECEC" />
+                  RowBackground="Transparent" IsReadOnly="True" HeadersVisibility="None" AutoGenerateColumns="False" 
+                  CanUserReorderColumns="False" ItemsSource="{Binding Path=Rows,ElementName=csvViewer}" 
+                  AlternatingRowBackground="#99D8D8D8" HorizontalGridLinesBrush="#FFBDBDBD" VerticalGridLinesBrush="#FFBDBDBD" />
 
     </Grid>
 </UserControl>

QuickLook.Plugin/QuickLook.Plugin.CsvViewer/CsvViewerPanel.xaml.cs

@@ -41,12 +41,14 @@ namespace QuickLook.Plugin.CsvViewer
 
         public void LoadFile(string path)
         {
-            const int limit = 100000;
+            const int limit = 10000;
             var binded = false;
 
-            using (var sr = new StreamReader(path))
+            using (var sr = new StreamReader(new FileStream(path, FileMode.Open, FileAccess.Read, FileShare.ReadWrite)))
             {
-                using (var parser = new CsvParser(sr))
+                var conf = new CsvHelper.Configuration.Configuration() {MissingFieldFound = null, BadDataFound = null};
+
+                using (var parser = new CsvParser(sr, conf))
                 {
                     var i = 0;
                     while (true)

QuickLook.Plugin/QuickLook.Plugin.CsvViewer/Plugin.cs

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -18,6 +18,7 @@
 using System;
 using System.IO;
 using System.Windows;
+using QuickLook.Common.Plugin;
 
 namespace QuickLook.Plugin.CsvViewer
 {
@@ -25,8 +26,7 @@ namespace QuickLook.Plugin.CsvViewer
     {
         private CsvViewerPanel _panel;
 
-        public int Priority => int.MaxValue;
-        public bool AllowsTransparency => true;
+        public int Priority => 0;
 
         public void Init()
         {
@@ -34,10 +34,7 @@ namespace QuickLook.Plugin.CsvViewer
 
         public bool CanHandle(string path)
         {
-            if (Directory.Exists(path))
-                return false;
-
-            return Path.GetExtension(path).ToLower() == ".csv";
+            return !Directory.Exists(path) && path.ToLower().EndsWith(".csv");
         }
 
         public void Prepare(string path, ContextObject context)
@@ -62,10 +59,5 @@ namespace QuickLook.Plugin.CsvViewer
 
             _panel = null;
         }
-
-        ~Plugin()
-        {
-            Cleanup();
-        }
     }
 }

QuickLook.Plugin/QuickLook.Plugin.CsvViewer/QuickLook.Plugin.CsvViewer.csproj

@@ -49,17 +49,22 @@
     <CodeAnalysisRuleSet>MinimumRecommendedRules.ruleset</CodeAnalysisRuleSet>
   </PropertyGroup>
   <PropertyGroup>
-    <SignAssembly>true</SignAssembly>
+    <SignAssembly>false</SignAssembly>
   </PropertyGroup>
   <PropertyGroup>
-    <AssemblyOriginatorKeyFile>key.snk</AssemblyOriginatorKeyFile>
+    <AssemblyOriginatorKeyFile>
+    </AssemblyOriginatorKeyFile>
   </PropertyGroup>
   <ItemGroup>
-    <Reference Include="CsvHelper, Version=2.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
-      <HintPath>..\..\packages\CsvHelper.2.16.3.0\lib\net45\CsvHelper.dll</HintPath>
+    <Reference Include="CsvHelper, Version=12.0.0.0, Culture=neutral, PublicKeyToken=8c4959082be5c823, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\CsvHelper.12.1.2\lib\net45\CsvHelper.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
     <Reference Include="System.Core" />
+    <Reference Include="System.ValueTuple, Version=4.0.3.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
+      <HintPath>..\..\packages\System.ValueTuple.4.5.0\lib\net461\System.ValueTuple.dll</HintPath>
+    </Reference>
     <Reference Include="System.Xaml">
       <RequiredTargetFramework>4.0</RequiredTargetFramework>
     </Reference>
@@ -83,14 +88,14 @@
     </Compile>
   </ItemGroup>
   <ItemGroup>
-    <ProjectReference Include="..\..\QuickLook\QuickLook.csproj">
-      <Project>{8b4a9ce5-67b5-4a94-81cb-3771f688fdeb}</Project>
-      <Name>QuickLook</Name>
+    <ProjectReference Include="..\..\QuickLook.Common\QuickLook.Common.csproj">
+      <Project>{85FDD6BA-871D-46C8-BD64-F6BB0CB5EA95}</Project>
+      <Name>QuickLook.Common</Name>
       <Private>False</Private>
     </ProjectReference>
   </ItemGroup>
   <ItemGroup>
-    <None Include="key.snk" />
+    <None Include="app.config" />
     <None Include="packages.config" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />

QuickLook.Plugin/QuickLook.Plugin.CsvViewer/app.config

@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<configuration>
+  <runtime>
+    <assemblyBinding xmlns="urn:schemas-microsoft-com:asm.v1">
+      <dependentAssembly>
+        <assemblyIdentity name="System.ValueTuple" publicKeyToken="cc7b13ffcd2ddd51" culture="neutral" />
+        <bindingRedirect oldVersion="0.0.0.0-4.0.3.0" newVersion="4.0.3.0" />
+      </dependentAssembly>
+    </assemblyBinding>
+  </runtime>
+</configuration>

QuickLook.Plugin/QuickLook.Plugin.CsvViewer/packages.config

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="utf-8"?>
-
 <packages>
-  <package id="CsvHelper" version="2.16.3.0" targetFramework="net462" />
+  <package id="CsvHelper" version="12.1.2" targetFramework="net462" />
+  <package id="System.ValueTuple" version="4.5.0" targetFramework="net462" />
 </packages>

QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/DpiHelpers.cs

@@ -1,63 +0,0 @@
-// Copyright <20> 2017 Paddy Xu
-// 
-// This file is part of QuickLook program.
-// 
-// This program is free software: you can redistribute it and/or modify
-// it under the terms of the GNU General Public License as published by
-// the Free Software Foundation, either version 3 of the License, or
-// (at your option) any later version.
-// 
-// This program is distributed in the hope that it will be useful,
-// but WITHOUT ANY WARRANTY; without even the implied warranty of
-// MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-// GNU General Public License for more details.
-// 
-// You should have received a copy of the GNU General Public License
-// along with this program.  If not, see <http://www.gnu.org/licenses/>.
-
-using System;
-using System.Drawing;
-using System.Runtime.InteropServices;
-
-namespace QuickLook.Plugin.HtmlViewer
-{
-    internal static class DpiHelper
-    {
-        public enum DeviceCap
-        {
-            /// <summary>
-            ///     Logical pixels inch in X
-            /// </summary>
-            LOGPIXELSX = 88,
-            /// <summary>
-            ///     Logical pixels inch in Y
-            /// </summary>
-            LOGPIXELSY = 90
-        }
-
-        public const float DEFAULT_DPI = 96;
-
-        public static Dpi GetCurrentDpi()
-        {
-            var g = Graphics.FromHwnd(IntPtr.Zero);
-            var desktop = g.GetHdc();
-
-            var dpi = new Dpi
-            {
-                HorizontalDpi = GetDeviceCaps(desktop, (int) DeviceCap.LOGPIXELSX),
-                VerticalDpi = GetDeviceCaps(desktop, (int) DeviceCap.LOGPIXELSY)
-            };
-
-            return dpi;
-        }
-
-        [DllImport("gdi32.dll", CharSet = CharSet.Auto, SetLastError = true, ExactSpelling = true)]
-        public static extern int GetDeviceCaps(IntPtr hDC, int nIndex);
-    }
-
-    internal class Dpi
-    {
-        public float HorizontalDpi { get; set; }
-        public float VerticalDpi { get; set; }
-    }
-}

QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Helper.cs

@@ -1,4 +1,4 @@
-// Copyright <EFBFBD> 2017 Paddy Xu
+// Copyright © 2017 Paddy Xu
 // 
 // This file is part of QuickLook program.
 // 
@@ -63,5 +63,25 @@ namespace QuickLook.Plugin.HtmlViewer
                 key?.SetValue(appName, value, RegistryValueKind.DWord);
             }
         }
+
+        internal static string GetUrlPath(string url)
+        {
+            int index = -1;
+            string[] lines = File.ReadAllLines(url);
+            foreach (string line in lines)
+            {
+                if (line.ToLower().Contains("url="))
+                {
+                    index = System.Array.IndexOf(lines, line);
+                    break;
+                }
+            }
+            if (index != -1)
+            {
+                var fullLine = lines.GetValue(index);
+                return fullLine.ToString().Substring(fullLine.ToString().LastIndexOf('=') + 1);
+            }
+            return url;
+        }
     }
 }

QuickLook.Plugin/QuickLook.Plugin.HtmlViewer/Plugin.cs

@@ -17,17 +17,20 @@
 
 using System;
 using System.IO;
+using System.Linq;
 using System.Windows;
 using System.Windows.Threading;
+using QuickLook.Common.Plugin;
 
 namespace QuickLook.Plugin.HtmlViewer
 {
     public class Plugin : IViewer
     {
+        private static readonly string[] Extensions = { ".mht", ".mhtml", ".htm", ".html", ".svg", ".url" };
+
         private WebpagePanel _panel;
 
-        public int Priority => int.MaxValue;
-        public bool AllowsTransparency => false;
+        public int Priority => 0;
 
         public void Init()
         {
@@ -36,25 +39,12 @@ namespace QuickLook.Plugin.HtmlViewer
 
         public bool CanHandle(string path)
         {
-            if (Directory.Exists(path))
-                return false;
-
-            switch (Path.GetExtension(path).ToLower())
-            {
-                case ".html":
-                case ".htm":
-                    return true;
-
-                default:
-                    return false;
-            }
+            return !Directory.Exists(path) && Extensions.Any(path.ToLower().EndsWith);
         }
 
         public void Prepare(string path, ContextObject context)
         {
-            context.PreferredSize = new Size(1000, 600);
-
-            context.CanFocus = true;
+            context.PreferredSize = new Size(1280, 720);
         }
 
         public void View(string path, ContextObject context)
@@ -63,21 +53,18 @@ namespace QuickLook.Plugin.HtmlViewer
             context.ViewerContent = _panel;
             context.Title = Path.IsPathRooted(path) ? Path.GetFileName(path) : path;
 
-            _panel.Navigate(path);
+            if (path.ToLower().EndsWith(".url"))
+            {
+                path = Helper.GetUrlPath(path);
+            }
+            _panel.LoadFile(path);
             _panel.Dispatcher.Invoke(() => { context.IsBusy = false; }, DispatcherPriority.Loaded);
         }
 
         public void Cleanup()
         {
-            GC.SuppressFinalize(this);
-
             _panel?.Dispose();
             _panel = null;
         }
-
-        ~Plugin()
-        {
-            Cleanup();
-        }
     }
 }