Cleanup code using latest C# (#255)

shibayan · Mar 17, 2024 · 765a15a · 765a15a
1 parent 7a8bf20
commit 765a15a
Show file tree

Hide file tree

Showing 11 changed files with 21 additions and 47 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -1,5 +1,8 @@
 <Project>
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.22621.0</TargetFramework>
+    <Platforms>x64;arm64</Platforms>
+    <Nullable>enable</Nullable>
+    <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 </Project>
diff --git a/WinQuickLook.App/Program.cs b/WinQuickLook.App/Program.cs
@@ -38,8 +38,8 @@ public static void Main(string[] args)
 
     private static void ConfigureService(IServiceCollection services)
     {
-        services.TryAddEnumerable(new[]
-        {
+        services.TryAddEnumerable(
+        [
             ServiceDescriptor.Singleton<IFileSystemPreviewHandler, CodeFilePreviewHandler>(),
             ServiceDescriptor.Singleton<IFileSystemPreviewHandler, GenericDirectoryPreviewHandler>(),
             ServiceDescriptor.Singleton<IFileSystemPreviewHandler, GenericFilePreviewHandler>(),
@@ -51,7 +51,7 @@ private static void ConfigureService(IServiceCollection services)
             ServiceDescriptor.Singleton<IFileSystemPreviewHandler, ShellFilePreviewHandler>(),
             ServiceDescriptor.Singleton<IFileSystemPreviewHandler, SvgFilePreviewHandler>(),
             ServiceDescriptor.Singleton<IFileSystemPreviewHandler, TextFilePreviewHandler>()
-        });
+        ]);
 
         services.AddSingleton<ShellAssociationProvider>();
         services.AddSingleton<ShellThumbnailProvider>();

diff --git a/WinQuickLook.App/WinQuickLook.App.csproj b/WinQuickLook.App/WinQuickLook.App.csproj
@@ -2,12 +2,9 @@
 
   <PropertyGroup>
     <OutputType>WinExe</OutputType>
-    <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <ApplicationIcon>Icon.ico</ApplicationIcon>
     <ApplicationManifest>app.manifest</ApplicationManifest>
-    <Platforms>x64;arm64</Platforms>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
     <RuntimeIdentifiers>win-x64;win-arm64</RuntimeIdentifiers>
     <PublishProfile>win-$(Platform).pubxml</PublishProfile>
     <GenerateSatelliteAssembliesForCore>true</GenerateSatelliteAssembliesForCore>

diff --git a/WinQuickLook.Core.Tests/WinQuickLook.Core.Tests.csproj b/WinQuickLook.Core.Tests/WinQuickLook.Core.Tests.csproj
@@ -1,11 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Nullable>enable</Nullable>
     <IsPackable>false</IsPackable>
     <RootNamespace>WinQuickLook.Tests</RootNamespace>
-    <Platforms>x64;arm64</Platforms>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
@@ -26,7 +23,7 @@
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>
-    <PackageReference Include="coverlet.collector" Version="6.0.1">
+    <PackageReference Include="coverlet.collector" Version="6.0.2">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
       <PrivateAssets>all</PrivateAssets>
     </PackageReference>

diff --git a/WinQuickLook.Core/Controls/ShellFileControl.cs b/WinQuickLook.Core/Controls/ShellFileControl.cs
@@ -37,7 +37,9 @@ protected override HandleRef BuildWindowCore(HandleRef hwndParent)
             WINDOW_STYLE.WS_CHILD | WINDOW_STYLE.WS_VISIBLE | WINDOW_STYLE.WS_CLIPCHILDREN,
             0, 0,
             (int)ActualWidth, (int)ActualHeight,
-            new HWND(hwndParent.Handle));
+            new HWND(hwndParent.Handle),
+            null,
+            null);
 
         return new HandleRef(this, hwndHost);
     }

diff --git a/WinQuickLook.Core/Messaging/LowLevelKeyboardHook.cs b/WinQuickLook.Core/Messaging/LowLevelKeyboardHook.cs
@@ -8,13 +8,8 @@
 
 namespace WinQuickLook.Messaging;
 
-public class LowLevelKeyboardHook : WindowsHook
+public class LowLevelKeyboardHook() : WindowsHook(WINDOWS_HOOK_ID.WH_KEYBOARD_LL)
 {
-    public LowLevelKeyboardHook()
-        : base(WINDOWS_HOOK_ID.WH_KEYBOARD_LL)
-    {
-    }
-
     public Action<VIRTUAL_KEY>? PerformKeyDown { get; set; }
 
     protected override LRESULT HookProc(int code, WPARAM wParam, LPARAM lParam)

diff --git a/WinQuickLook.Core/Messaging/LowLevelMouseHook.cs b/WinQuickLook.Core/Messaging/LowLevelMouseHook.cs
@@ -4,13 +4,8 @@
 
 namespace WinQuickLook.Messaging;
 
-public class LowLevelMouseHook : WindowsHook
+public class LowLevelMouseHook() : WindowsHook(WINDOWS_HOOK_ID.WH_MOUSE_LL)
 {
-    public LowLevelMouseHook()
-        : base(WINDOWS_HOOK_ID.WH_MOUSE_LL)
-    {
-    }
-
     protected override LRESULT HookProc(int code, WPARAM wParam, LPARAM lParam)
     {
         if (code == PInvoke.HC_ACTION && wParam == PInvoke.WM_LBUTTONDOWN)

diff --git a/WinQuickLook.Core/Providers/ShellAssociationProvider.cs b/WinQuickLook.Core/Providers/ShellAssociationProvider.cs
@@ -49,14 +49,14 @@ public IReadOnlyList<Entry> GetRecommends(FileInfo fileInfo)
     {
         if (PInvoke.SHAssocEnumHandlers(fileInfo.Extension, ASSOC_FILTER.ASSOC_FILTER_RECOMMENDED, out var enumAssocHandlers).Failed)
         {
-            return Array.Empty<Entry>();
+            return [];
         }
 
         try
         {
             var recommends = new List<Entry>();
 
-            var assocHandlers = new IAssocHandler?[8];
+            var assocHandlers = new IAssocHandler[8];
 
             while (enumAssocHandlers.Next(assocHandlers, out var fetched).Succeeded)
             {
@@ -69,11 +69,6 @@ public IReadOnlyList<Entry> GetRecommends(FileInfo fileInfo)
                 {
                     var assocHandler = assocHandlers[i];
 
-                    if (assocHandler is null)
-                    {
-                        continue;
-                    }
-
                     try
                     {
                         assocHandler.GetUIName(out var pUiName);
@@ -115,7 +110,7 @@ public void Invoke(string appName, FileInfo fileInfo)
 
         try
         {
-            var assocHandlers = new IAssocHandler?[8];
+            var assocHandlers = new IAssocHandler[8];
 
             while (enumAssocHandlers.Next(assocHandlers, out var fetched).Succeeded)
             {
@@ -128,11 +123,6 @@ public void Invoke(string appName, FileInfo fileInfo)
                 {
                     var assocHandler = assocHandlers[i];
 
-                    if (assocHandler is null)
-                    {
-                        continue;
-                    }
-
                     try
                     {
                         assocHandler.GetUIName(out var pUiName);

diff --git a/WinQuickLook.Core/WinQuickLook.Core.csproj b/WinQuickLook.Core/WinQuickLook.Core.csproj
@@ -1,17 +1,14 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Nullable>enable</Nullable>
     <UseWPF>true</UseWPF>
     <RootNamespace>WinQuickLook</RootNamespace>
-    <Platforms>x64;arm64</Platforms>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>
     <PackageReference Include="AvalonEdit" Version="6.3.0.90" />
     <PackageReference Include="Cylinder.WPF" Version="1.0.0-preview.2" />
-    <PackageReference Include="Markdig" Version="0.35.0" />
+    <PackageReference Include="Markdig" Version="0.36.2" />
     <PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2365.46" />
   </ItemGroup>
 

diff --git a/WinQuickLook.CsWin32/PInvoke.cs b/WinQuickLook.CsWin32/PInvoke.cs
@@ -20,30 +20,30 @@ public static partial class PInvoke
     public const uint MF_SOURCE_READER_FIRST_VIDEO_STREAM = 0xFFFFFFFCU;
     public const uint MF_SOURCE_READER_FIRST_AUDIO_STREAM = 0xFFFFFFFDU;
 
-    public static HRESULT SHCreateItemFromParsingName<T>(string pszPath, System.Com.IBindCtx pbc, out T ppv)
+    public static HRESULT SHCreateItemFromParsingName<T>(string pszPath, System.Com.IBindCtx? pbc, out T ppv)
     {
         var hr = SHCreateItemFromParsingName(pszPath, pbc, typeof(T).GUID, out var o);
         ppv = (T)o;
         return hr;
     }
 
-    public static HRESULT SHGetPropertyStoreFromParsingName<T>(string pszPath, System.Com.IBindCtx pbc, GETPROPERTYSTOREFLAGS flags, out T ppv)
+    public static HRESULT SHGetPropertyStoreFromParsingName<T>(string pszPath, System.Com.IBindCtx? pbc, GETPROPERTYSTOREFLAGS flags, out T ppv)
     {
         var hr = SHGetPropertyStoreFromParsingName(pszPath, pbc, flags, typeof(T).GUID, out var o);
         ppv = (T)o;
         return hr;
     }
 
     /// <inheritdoc cref="AssocQueryString(ASSOCF, ASSOCSTR, PCWSTR, PCWSTR, PWSTR, uint*)"/>
-    public static unsafe HRESULT AssocQueryString(ASSOCF flags, ASSOCSTR str, string pszAssoc, string pszExtra, Span<char> pszOut, ref uint pcchOut)
+    public static unsafe HRESULT AssocQueryString(ASSOCF flags, ASSOCSTR str, string pszAssoc, string? pszExtra, Span<char> pszOut, ref uint pcchOut)
     {
         fixed (char* pszOutLocal = pszOut)
         {
             return AssocQueryString(flags, str, pszAssoc, pszExtra, new PWSTR(pszOutLocal), ref pcchOut);
         }
     }
 
-    public static unsafe HWND CreateWindowEx(WINDOW_EX_STYLE dwExStyle, string lpClassName, string lpWindowName, WINDOW_STYLE dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent, SafeHandle hMenu = default, SafeHandle hInstance = default)
+    public static unsafe HWND CreateWindowEx(WINDOW_EX_STYLE dwExStyle, string lpClassName, string lpWindowName, WINDOW_STYLE dwStyle, int X, int Y, int nWidth, int nHeight, HWND hWndParent, SafeHandle? hMenu, SafeHandle? hInstance)
     {
         return CreateWindowEx(dwExStyle, lpClassName, lpWindowName, dwStyle, X, Y, nWidth, nHeight, hWndParent, hMenu, hInstance, null);
     }

diff --git a/WinQuickLook.CsWin32/WinQuickLook.CsWin32.csproj b/WinQuickLook.CsWin32/WinQuickLook.CsWin32.csproj
@@ -1,10 +1,8 @@
 <Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
-    <Platforms>x64;arm64</Platforms>
     <NoWarn>CS0109</NoWarn>
     <RootNamespace>Windows.Win32</RootNamespace>
-    <WarningsAsErrors>nullable</WarningsAsErrors>
   </PropertyGroup>
 
   <ItemGroup>