Code Quality: Bump CsWin32 to latest available (#15637)

AArnott · web-flow · commit 98a1ed6d0387 · 2024-06-20T13:01:52.000-07:00
diff --git a/src/Files.App.Server/Files.App.Server.csproj b/src/Files.App.Server/Files.App.Server.csproj
@@ -40,7 +40,7 @@
         <Manifest Include="app.manifest" />
         <TrimmerRootAssembly Include="Files.App.Server" />
         <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
-        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.1.647-beta" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" PrivateAssets="all" />
     </ItemGroup>
 
     <ItemGroup>
diff --git a/src/Files.App.Server/Helpers.cs b/src/Files.App.Server/Helpers.cs
@@ -3,40 +3,31 @@
 
 using System.Runtime.CompilerServices;
 using System.Runtime.InteropServices;
+using Windows.Win32.Foundation;
+using Windows.Win32.System.WinRT;
 using WinRT;
 
 namespace Files.App.Server;
 
 unsafe partial class Helpers
 {
 	[UnmanagedCallersOnly(CallConvs = [typeof(CallConvStdcall)])]
-	public static int GetActivationFactory(void* activatableClassId, void** factory)
+	public static HRESULT GetActivationFactory(HSTRING activatableClassId, IActivationFactory** factory)
 	{
-		const int E_INVALIDARG = unchecked((int)0x80070057);
-		const int CLASS_E_CLASSNOTAVAILABLE = unchecked((int)0x80040111);
-		const int S_OK = 0;
-
-		if (activatableClassId is null || factory is null)
+		if (activatableClassId.IsNull || factory is null)
 		{
-			return E_INVALIDARG;
+			return HRESULT.E_INVALIDARG;
 		}
 
 		try
 		{
-			IntPtr obj = Module.GetActivationFactory(MarshalString.FromAbi((IntPtr)activatableClassId));
-
-			if ((void*)obj is null)
-			{
-				return CLASS_E_CLASSNOTAVAILABLE;
-			}
-
-			*factory = (void*)obj;
-			return S_OK;
+			*factory = (IActivationFactory*)Module.GetActivationFactory(MarshalString.FromAbi((IntPtr)activatableClassId));
+			return *factory is null ? HRESULT.CLASS_E_CLASSNOTAVAILABLE : HRESULT.S_OK;
 		}
 		catch (Exception e)
 		{
 			ExceptionHelpers.SetErrorInfo(e);
-			return ExceptionHelpers.GetHRForException(e);
+			return (HRESULT)ExceptionHelpers.GetHRForException(e);
 		}
 	}
 }
diff --git a/src/Files.App.Server/NativeMethods.txt b/src/Files.App.Server/NativeMethods.txt
@@ -1,8 +1,10 @@
 // Copyright (c) 2024 Files Community
 // Licensed under the MIT License. See the LICENSE.
 
+CLASS_E_CLASSNOTAVAILABLE
+E_INVALIDARG
+RoInitialize
 RoRegisterActivationFactories
 RoRevokeActivationFactories
 WindowsCreateString
 WindowsDeleteString
-RoInitialize
diff --git a/src/Files.App.Server/Program.cs b/src/Files.App.Server/Program.cs
@@ -21,7 +21,7 @@ static async Task Main()
 	{
 		AppDomain.CurrentDomain.FirstChanceException += OnFirstChanceException;
 
-		nint cookie = 0;
+		RO_REGISTRATION_COOKIE cookie = default;
 
 		_ = PInvoke.RoInitialize(RO_INIT_TYPE.RO_INIT_MULTITHREADED);
 
@@ -42,11 +42,18 @@ static async Task Main()
 
 		unsafe
 		{
-			var callbacks = Enumerable.Repeat((nint)(delegate* unmanaged[Stdcall]<void*, void**, int>)&Helpers.GetActivationFactory, classIds.Length).ToArray();
+			delegate* unmanaged[Stdcall]<HSTRING, IActivationFactory**, HRESULT>[] callbacks = new delegate* unmanaged[Stdcall]<HSTRING, IActivationFactory**, HRESULT>[classIds.Length];
+			for (int i = 0; i < callbacks.Length; i++)
+			{
+				callbacks[i] = &Helpers.GetActivationFactory;
+			}
 
-			if (PInvoke.RoRegisterActivationFactories(classIds, callbacks, out cookie) is HRESULT hr && hr.Value != 0)
+			fixed (delegate* unmanaged[Stdcall]<HSTRING, IActivationFactory**, HRESULT>* pCallbacks = callbacks)
 			{
-				Marshal.ThrowExceptionForHR(hr);
+				if (PInvoke.RoRegisterActivationFactories(classIds, pCallbacks, out cookie) is HRESULT hr && hr.Value != 0)
+				{
+					Marshal.ThrowExceptionForHR(hr);
+				}
 			}
 		}
 
diff --git a/src/Files.App/Files.App.csproj b/src/Files.App/Files.App.csproj
@@ -89,7 +89,7 @@
         <PackageReference Include="Vanara.Windows.Shell" Version="4.0.1" />
         <PackageReference Include="Microsoft.Management.Infrastructure" Version="3.0.0" />
         <PackageReference Include="Microsoft.Management.Infrastructure.Runtime.Win" Version="3.0.0" />
-        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.49-beta" PrivateAssets="all" />
+        <PackageReference Include="Microsoft.Windows.CsWin32" Version="0.3.106" PrivateAssets="all" />
         <PackageReference Include="Microsoft.Windows.CsWinRT" Version="2.0.7" />
     </ItemGroup>
   
diff --git a/src/Files.App/Services/Storage/StorageNetworkService.cs b/src/Files.App/Services/Storage/StorageNetworkService.cs
@@ -184,7 +184,7 @@ public bool DisconnectNetworkDrive(ILocatableFolder drive)
 			return
 				PInvoke.WNetCancelConnection2W(
 					drive.Path.TrimEnd('\\'),
-					(uint)NET_USE_CONNECT_FLAGS.CONNECT_UPDATE_PROFILE,
+					NET_CONNECT_FLAGS.CONNECT_UPDATE_PROFILE,
 					true)
 				is WIN32_ERROR.NO_ERROR;
 		}

Original file line number	Diff line number	Diff line change
`@@ -3,40 +3,31 @@`
`3`	`3`
`4`	`4`	`using System.Runtime.CompilerServices;`
`5`	`5`	`using System.Runtime.InteropServices;`
	`6`	`+using Windows.Win32.Foundation;`
	`7`	`+using Windows.Win32.System.WinRT;`
`6`	`8`	`using WinRT;`
`7`	`9`
`8`	`10`	`namespace Files.App.Server;`
`9`	`11`
`10`	`12`	`unsafe partial class Helpers`
`11`	`13`	`{`
`12`	`14`	`[UnmanagedCallersOnly(CallConvs = [typeof(CallConvStdcall)])]`
`13`		`- public static int GetActivationFactory(void* activatableClassId, void** factory)`
	`15`	`+ public static HRESULT GetActivationFactory(HSTRING activatableClassId, IActivationFactory** factory)`
`14`	`16`	`{`
`15`		`- const int E_INVALIDARG = unchecked((int)0x80070057);`
`16`		`- const int CLASS_E_CLASSNOTAVAILABLE = unchecked((int)0x80040111);`
`17`		`- const int S_OK = 0;`
`18`		`-`
`19`		`- if (activatableClassId is null \|\| factory is null)`
	`17`	`+ if (activatableClassId.IsNull \|\| factory is null)`
`20`	`18`	`{`
`21`		`- return E_INVALIDARG;`
	`19`	`+ return HRESULT.E_INVALIDARG;`
`22`	`20`	`}`
`23`	`21`
`24`	`22`	`try`
`25`	`23`	`{`
`26`		`- IntPtr obj = Module.GetActivationFactory(MarshalString.FromAbi((IntPtr)activatableClassId));`
`27`		`-`
`28`		`- if ((void*)obj is null)`
`29`		`- {`
`30`		`- return CLASS_E_CLASSNOTAVAILABLE;`
`31`		`- }`
`32`		`-`
`33`		`- factory = (void)obj;`
`34`		`- return S_OK;`
	`24`	`+ factory = (IActivationFactory)Module.GetActivationFactory(MarshalString.FromAbi((IntPtr)activatableClassId));`
	`25`	`+ return *factory is null ? HRESULT.CLASS_E_CLASSNOTAVAILABLE : HRESULT.S_OK;`
`35`	`26`	`}`
`36`	`27`	`catch (Exception e)`
`37`	`28`	`{`
`38`	`29`	`ExceptionHelpers.SetErrorInfo(e);`
`39`		`- return ExceptionHelpers.GetHRForException(e);`
	`30`	`+ return (HRESULT)ExceptionHelpers.GetHRForException(e);`
`40`	`31`	`}`
`41`	`32`	`}`
`42`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -21,7 +21,7 @@ static async Task Main()`
`21`	`21`	`{`
`22`	`22`	`AppDomain.CurrentDomain.FirstChanceException += OnFirstChanceException;`
`23`	`23`
`24`		`- nint cookie = 0;`
	`24`	`+ RO_REGISTRATION_COOKIE cookie = default;`
`25`	`25`
`26`	`26`	`_ = PInvoke.RoInitialize(RO_INIT_TYPE.RO_INIT_MULTITHREADED);`
`27`	`27`
`@@ -42,11 +42,18 @@ static async Task Main()`
`42`	`42`
`43`	`43`	`unsafe`
`44`	`44`	`{`
`45`		`- var callbacks = Enumerable.Repeat((nint)(delegate* unmanaged[Stdcall]<void, void*, int>)&Helpers.GetActivationFactory, classIds.Length).ToArray();`
	`45`	`+ delegate* unmanaged[Stdcall]<HSTRING, IActivationFactory*, HRESULT>[] callbacks = new delegate unmanaged[Stdcall]<HSTRING, IActivationFactory**, HRESULT>[classIds.Length];`
	`46`	`+ for (int i = 0; i < callbacks.Length; i++)`
	`47`	`+ {`
	`48`	`+ callbacks[i] = &Helpers.GetActivationFactory;`
	`49`	`+ }`
`46`	`50`
`47`		`- if (PInvoke.RoRegisterActivationFactories(classIds, callbacks, out cookie) is HRESULT hr && hr.Value != 0)`
	`51`	`+ fixed (delegate* unmanaged[Stdcall]<HSTRING, IActivationFactory*, HRESULT> pCallbacks = callbacks)`
`48`	`52`	`{`
`49`		`- Marshal.ThrowExceptionForHR(hr);`
	`53`	`+ if (PInvoke.RoRegisterActivationFactories(classIds, pCallbacks, out cookie) is HRESULT hr && hr.Value != 0)`
	`54`	`+ {`
	`55`	`+ Marshal.ThrowExceptionForHR(hr);`
	`56`	`+ }`
`50`	`57`	`}`
`51`	`58`	`}`
`52`	`59`
Original file line number	Diff line number	Diff line change
`@@ -184,7 +184,7 @@ public bool DisconnectNetworkDrive(ILocatableFolder drive)`
`184`	`184`	`return`
`185`	`185`	`PInvoke.WNetCancelConnection2W(`
`186`	`186`	`drive.Path.TrimEnd('\\'),`
`187`		`- (uint)NET_USE_CONNECT_FLAGS.CONNECT_UPDATE_PROFILE,`
	`187`	`+ NET_CONNECT_FLAGS.CONNECT_UPDATE_PROFILE,`
`188`	`188`	`true)`
`189`	`189`	`is WIN32_ERROR.NO_ERROR;`
`190`	`190`	`}`