Resolved issue in sending WM_DESTROY msg to ActiveX controls (#12564)

Sachin-NI · Epica3055 · commit c2270c138ae9 · 2024-12-19T18:08:27.000+08:00
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.cs b/src/System.Windows.Forms/src/System/Windows/Forms/ActiveX/AxHost.cs
@@ -3234,8 +3234,9 @@ protected override unsafe void WndProc(ref Message m)
 
     private unsafe void DetachAndForward(ref Message m)
     {
+        bool isHandleCreated = IsHandleCreated;
         DetachWindow();
-        if (IsHandleCreated)
+        if (isHandleCreated)
         {
             void* wndProc = (void*)PInvoke.GetWindowLong(this, WINDOW_LONG_PTR_INDEX.GWL_WNDPROC);
             m.ResultInternal = PInvoke.CallWindowProc(

Original file line number	Diff line number	Diff line change
`@@ -3234,8 +3234,9 @@ protected override unsafe void WndProc(ref Message m)`
`3234`	`3234`
`3235`	`3235`	`private unsafe void DetachAndForward(ref Message m)`
`3236`	`3236`	`{`
	`3237`	`+ bool isHandleCreated = IsHandleCreated;`
`3237`	`3238`	`DetachWindow();`
`3238`		`- if (IsHandleCreated)`
	`3239`	`+ if (isHandleCreated)`
`3239`	`3240`	`{`
`3240`	`3241`	`void* wndProc = (void*)PInvoke.GetWindowLong(this, WINDOW_LONG_PTR_INDEX.GWL_WNDPROC);`
`3241`	`3242`	`m.ResultInternal = PInvoke.CallWindowProc(`