Merge pull request #12342 from lonitra/backport12333

[release/8.0] Fix ConnectionPointCookie usages

Author: lonitra

src/System.Windows.Forms/src/System/Windows/Forms/AxHost.OleInterfaces.cs

@@ -56,7 +56,7 @@ internal void StartEvents()
             }
 
             object nativeObject = _host.GetOcx();
-            _connectionPoint = new ConnectionPointCookie(nativeObject, this, typeof(IPropertyNotifySink), throwException: false);
+            _connectionPoint = new ConnectionPointCookie(nativeObject, this, typeof(IPropertyNotifySink.Interface), throwException: false);
         }
 
         internal void StopEvents()

src/System.Windows.Forms/src/System/Windows/Forms/WebBrowserSiteBase.cs

@@ -384,11 +384,18 @@ internal void StartEvents()
         {
             try
             {
-                connectionPoint = new AxHost.ConnectionPointCookie(nativeObject, this, typeof(IPropertyNotifySink));
+                connectionPoint = new AxHost.ConnectionPointCookie(nativeObject, this, typeof(IPropertyNotifySink.Interface));
             }
+#if DEBUG
+            catch (Exception)
+            {
+                throw;
+            }
+#else
             catch (Exception ex) when (!ex.IsCriticalException())
             {
             }
+#endif
         }
     }
 

src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/AxHostTests.cs

@@ -3085,6 +3085,18 @@ public unsafe void AxHost_Ocx_Dispose_Success()
         Assert.Equal((uint)0, ocx.Value->Release() - 1);
     }
 
+    [WinFormsFact]
+    public unsafe void AxHost_Ocx_ConnectionPoint_Success()
+    {
+        using SubAxHost control = new(WebBrowserClsidString);
+        control.CreateControl();
+
+        object site = control.TestAccessor().Dynamic._oleSite;
+        AxHost.ConnectionPointCookie cookie = site.TestAccessor().Dynamic._connectionPoint;
+        Assert.NotNull(cookie);
+        Assert.True(cookie.Connected);
+    }
+
     private class SubComponentEditor : ComponentEditor
     {
         public override bool EditComponent(ITypeDescriptorContext context, object component)

src/System.Windows.Forms/tests/UnitTests/System/Windows/Forms/WebBrowserTests.cs

@@ -4742,4 +4742,32 @@ private class SubWebBrowser : WebBrowser
 
         public new void WndProc(ref Message m) => base.WndProc(ref m);
     }
+
+    [WinFormsFact]
+    public void WebBrowser_NavigateToFileFolder()
+    {
+        using Form form = new();
+        using WebBrowser browser = new()
+        {
+            Dock = DockStyle.Fill
+        };
+
+        string navigated = null;
+        browser.Navigated += (sender, e) =>
+        {
+            navigated = browser.Url.ToString();
+            form.Close();
+        };
+
+        form.Controls.Add(browser);
+
+        form.Load += (sender, e) =>
+        {
+            browser.Navigate(@"file://C:/");
+        };
+
+        form.Show();
+
+        Assert.Equal(@"file:///C:/", navigated);
+    }
 }