WI01118904 - Handle disposed AsyncWaitHandle during completion

src/System.Windows.Forms.Legacy/System.Windows.Forms.Package/System.Windows.Forms.Package.csproj

@@ -10,7 +10,7 @@
     <WtgPackageVersionPrefix>0.1.0</WtgPackageVersionPrefix>
     <PackageVersion Condition="'$(PackageVersion)' == ''">$(WtgPackageVersionPrefix)-dev</PackageVersion>
     <PackageDescription>WiseTech Global forked version of System.Windows.Forms that includes controls that were deprecated in .NET Core 3.1 and .NET 5, like DataGrid, Menu, ToolBar and StatusBar.</PackageDescription>
-    <PackageReleaseNotes>Fix the accessibility access on DataGrid components, PR link: https://github.com/WiseTechGlobal/winforms/pull/41</PackageReleaseNotes>
+    <PackageReleaseNotes>Handle disposed AsyncWaitHandle during BeginInvoke completion, version 0.2.17, PR link: https://github.com/WiseTechGlobal/winforms/pull/42</PackageReleaseNotes>
     <Authors>WiseTech Global</Authors>
     <Copyright>© WiseTech Global Limited. All rights reserved.</Copyright>
     <PackageReadmeFile>README.md</PackageReadmeFile>

src/System.Windows.Forms/System/Windows/Forms/Control.ThreadMethodEntry.cs

@@ -76,7 +76,14 @@ internal void Complete()
             lock (_invokeSyncObject)
             {
                 IsCompleted = true;
-                _resetEvent?.Set();
+                try
+                {
+                    _resetEvent?.Set();
+                }
+                catch (ObjectDisposedException)
+                {
+                    // AsyncWaitHandle exposes the event and allows callers to dispose it before completion.
+                }
             }
         }
     }

src/test/unit/System.Windows.Forms/System/Windows/Forms/ControlTests.Methods.cs

@@ -3850,6 +3850,21 @@ await Task.Run(() =>
         Assert.Equal(0, createdCallCount);
     }
 
+    [WinFormsFact]
+    public void Control_BeginInvoke_DisposedAsyncWaitHandle_CompletesCallback()
+    {
+        using Control control = new();
+        Assert.NotEqual(IntPtr.Zero, control.Handle);
+        bool callbackInvoked = false;
+        IAsyncResult asyncResult = control.BeginInvoke(() => callbackInvoked = true);
+        asyncResult.AsyncWaitHandle.Dispose();
+
+        Application.DoEvents();
+
+        Assert.True(callbackInvoked);
+        Assert.True(asyncResult.IsCompleted);
+    }
+
     [WinFormsFact]
     public void Control_Invoke_Action_calls_correct_method()
     {