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

Sachin-NI · Epica3055 · commit 5d9bd8e7d4d6 · 2024-12-19T17:50:51.000+08:00
diff --git a/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs b/src/System.Windows.Forms/src/System/Windows/Forms/AxHost.cs
@@ -3370,8 +3370,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
`@@ -3370,8 +3370,9 @@ protected override unsafe void WndProc(ref Message m)`
`3370`	`3370`
`3371`	`3371`	`private unsafe void DetachAndForward(ref Message m)`
`3372`	`3372`	`{`
	`3373`	`+ bool isHandleCreated = IsHandleCreated;`
`3373`	`3374`	`DetachWindow();`
`3374`		`- if (IsHandleCreated)`
	`3375`	`+ if (isHandleCreated)`
`3375`	`3376`	`{`
`3376`	`3377`	`void* wndProc = (void*)PInvoke.GetWindowLong(this, WINDOW_LONG_PTR_INDEX.GWL_WNDPROC);`
`3377`	`3378`	`m.ResultInternal = PInvoke.CallWindowProc(`