Add UnsafeDispose methods to ComServer and WinRtServer

shmuelie · Oct 21, 2024 · 28da40a · 28da40a
1 parent 074f943
commit 28da40a
Show file tree

Hide file tree

Showing 4 changed files with 56 additions and 2 deletions.
diff --git a/Directory.Build.props b/Directory.Build.props
@@ -19,7 +19,7 @@
     As such, this needs to be changed before a new release as well.
   -->
   <PropertyGroup>
-    <ShmuelieWinRTServerPackageVersion>2.0.0</ShmuelieWinRTServerPackageVersion>
+    <ShmuelieWinRTServerPackageVersion>2.1.0</ShmuelieWinRTServerPackageVersion>
     <IsCommitOnReleaseBranch>false</IsCommitOnReleaseBranch>
   </PropertyGroup>
 

diff --git a/src/Shmuelie.WinRTServer/ComServer.cs b/src/Shmuelie.WinRTServer/ComServer.cs
@@ -257,6 +257,35 @@ public bool IsDisposed
         private set;
     }
 
+    /// <summary>
+    /// Force the server to stop and release all resources.
+    /// </summary>
+    /// <remarks>Unlike <see cref="DisposeAsync"/>, <see cref="UnsafeDispose"/> will ignore if any objects are still alive before unregistering class factories.</remarks>
+    /// <seealso cref="DisposeAsync"/>
+    public void UnsafeDispose()
+    {
+        if (!IsDisposed)
+        {
+            try
+            {
+                _ = CoSuspendClassObjects();
+
+                liveServers.Clear();
+                lifetimeCheckTimer.Stop();
+                lifetimeCheckTimer.Dispose();
+
+                foreach (var clsid in factories.Keys)
+                {
+                    _ = UnregisterClassFactory(clsid);
+                }
+            }
+            finally
+            {
+                IsDisposed = true;
+            }
+        }
+    }
+
     /// <inheritdoc/>
     public async ValueTask DisposeAsync()
     {

diff --git a/src/Shmuelie.WinRTServer/Shmuelie.WinRTServer.csproj b/src/Shmuelie.WinRTServer/Shmuelie.WinRTServer.csproj
@@ -2,7 +2,7 @@
   <PropertyGroup>
     <TargetFramework>net8.0-windows10.0.22000.0</TargetFramework>
     <IsPackable>true</IsPackable>
-    <PackageReleaseNotes>Remove support for .NET Standard 2.0 and made package AOT compatible.</PackageReleaseNotes>
+    <PackageReleaseNotes>Add UnsafeDispose methods to ComServer and WinRtServer.</PackageReleaseNotes>
     <IsAotCompatible>True</IsAotCompatible>
     <DisableRuntimeMarshalling>True</DisableRuntimeMarshalling>
     <RuntimeIdentifiers>win-x64;win-x86;win-arm64;$(RuntimeIdentifiers)</RuntimeIdentifiers>

diff --git a/src/Shmuelie.WinRTServer/WinRtServer.cs b/src/Shmuelie.WinRTServer/WinRtServer.cs
@@ -310,6 +310,31 @@ public void Stop()
         return await local.Task.ConfigureAwait(false);
     }
 
+    /// <summary>
+    /// Force the server to stop and release all resources.
+    /// </summary>
+    /// <remarks>Unlike <see cref="DisposeAsync"/>, <see cref="UnsafeDispose"/> will ignore if any objects are still alive before unregistering activation factories.</remarks>
+    /// <seealso cref="DisposeAsync"/>
+    public void UnsafeDispose()
+    {
+        if (!IsDisposed)
+        {
+            try
+            {
+                liveServers.Clear();
+                lifetimeCheckTimer.Stop();
+                lifetimeCheckTimer.Dispose();
+
+                RoRevokeActivationFactories(registrationCookie);
+                registrationCookie = (RO_REGISTRATION_COOKIE)0;
+            }
+            finally
+            {
+                IsDisposed = true;
+            }
+        }
+    }
+
     /// <inheritdoc/>
     public async ValueTask DisposeAsync()
     {