Smoketest/1.0.1158 testing (#122)

* Updates for Win32, WPF and WinForms sample apps from 100.0.1158.0

* Updated package version for Win32, WPF and WinForms sample apps to 1.0.1158-prerelease

Co-authored-by: WebView2 Github Bot <[email protected]>

Author: oggy22

SampleApps/WebView2APISample/AudioComponent.cpp

@@ -64,6 +64,8 @@ void AudioComponent::ToggleMuteState()
          BOOL isMuted;
          CHECK_FAILURE(webview2_8->get_IsMuted(&isMuted));
          CHECK_FAILURE(webview2_8->put_IsMuted(!isMuted));
+         std::wstring result = !isMuted ? L"WebView is Now Muted" : L"WebView is Now Unmuted";
+         MessageBox(nullptr, result.c_str(), L"Mute State Changed", MB_OK);
      }
  }
 

SampleApps/WebView2APISample/ProcessComponent.cpp

@@ -280,7 +280,7 @@ void ProcessComponent::CrashRenderProcess()
     m_webView->Navigate(L"edge://kill");
 }
 
-//! [ProcessInfosChanged]
+//! [ProcessInfosChanged1]
 void ProcessComponent::PerformanceInfo()
 {
     std::wstring result;
@@ -324,7 +324,7 @@ void ProcessComponent::PerformanceInfo()
     }
     MessageBox(nullptr, result.c_str(), L"Memory Usage", MB_OK);
 }
-//! [ProcessInfosChanged]
+//! [ProcessInfosChanged1]
 
 /*static*/ void ProcessComponent::EnsureProcessIsClosed(UINT processId, int timeoutMs)
 {

SampleApps/WebView2APISample/ScenarioClientCertificateRequested.cpp

@@ -9,7 +9,7 @@
 
 using namespace Microsoft::WRL;
 
-static PCWSTR NameOfCertificateKind(COREWEBVIEW2_CLIENT_CERTIFICATE_KIND kind);
+static PCWSTR NameOfCertificateKind(COREWEBVIEW2_CERTIFICATE_KIND kind);
 
 ScenarioClientCertificateRequested::ScenarioClientCertificateRequested(AppWindow* appWindow)
     : m_appWindow(appWindow), m_webView(appWindow->GetWebView())
@@ -29,7 +29,7 @@ ScenarioClientCertificateRequested::ScenarioClientCertificateRequested(AppWindow
                     ICoreWebView2* sender,
                     ICoreWebView2ClientCertificateRequestedEventArgs* args) {
                         auto showDialog = [this, args] {
-                            wil::com_ptr<ICoreWebView2ClientCertificateCollection> certificateCollection;
+                            wil::com_ptr<ICoreWebView2CertificateCollection> certificateCollection;
                             CHECK_FAILURE(args->get_MutuallyTrustedCertificates(&certificateCollection));
 
                             wil::unique_cotaskmem_string host;
@@ -41,7 +41,7 @@ ScenarioClientCertificateRequested::ScenarioClientCertificateRequested(AppWindow
                             UINT certificateCollectionCount;
                             CHECK_FAILURE(certificateCollection->get_Count(&certificateCollectionCount));
 
-                            wil::com_ptr<ICoreWebView2ClientCertificate> certificate = nullptr;
+                            wil::com_ptr<ICoreWebView2Certificate> certificate = nullptr;
 
                             if (certificateCollectionCount > 0)
                             {
@@ -57,7 +57,7 @@ ScenarioClientCertificateRequested::ScenarioClientCertificateRequested(AppWindow
 
                                     CHECK_FAILURE(certificate->get_Issuer(&clientCertificate.Issuer));
 
-                                    COREWEBVIEW2_CLIENT_CERTIFICATE_KIND Kind;
+                                    COREWEBVIEW2_CERTIFICATE_KIND Kind;
                                     CHECK_FAILURE(
                                         certificate->get_Kind(&Kind));
                                     clientCertificate.CertificateKind = NameOfCertificateKind(Kind);
@@ -123,13 +123,13 @@ ScenarioClientCertificateRequested::ScenarioClientCertificateRequested(AppWindow
     //! [ClientCertificateRequested2]
 }
 
-static PCWSTR NameOfCertificateKind(COREWEBVIEW2_CLIENT_CERTIFICATE_KIND kind)
+static PCWSTR NameOfCertificateKind(COREWEBVIEW2_CERTIFICATE_KIND kind)
 {
     switch (kind)
     {
-    case COREWEBVIEW2_CLIENT_CERTIFICATE_KIND_SMART_CARD:
+    case COREWEBVIEW2_CERTIFICATE_KIND_SMART_CARD:
         return L"Smart Card";
-    case COREWEBVIEW2_CLIENT_CERTIFICATE_KIND_PIN:
+    case COREWEBVIEW2_CERTIFICATE_KIND_PIN:
         return L"PIN";
     default:
         return L"Other";

SampleApps/WebView2APISample/ScenarioIFrameDevicePermission.cpp

@@ -29,13 +29,13 @@ ScenarioIFrameDevicePermission::ScenarioIFrameDevicePermission(AppWindow* appWin
                     wil::com_ptr<ICoreWebView2Frame> webviewFrame;
                     CHECK_FAILURE(args->get_Frame(&webviewFrame));
 
-                    m_experimentalFrame3 = webviewFrame.try_query<ICoreWebView2ExperimentalFrame3>();
-                    if (m_experimentalFrame3)
+                    m_frame3 = webviewFrame.try_query<ICoreWebView2Frame3>();
+                    if (m_frame3)
                     {
-                        CHECK_FAILURE(m_experimentalFrame3->add_PermissionRequested(
-                            Callback<ICoreWebView2ExperimentalFramePermissionRequestedEventHandler>(
+                        CHECK_FAILURE(m_frame3->add_PermissionRequested(
+                            Callback<ICoreWebView2FramePermissionRequestedEventHandler>(
                                 [this](ICoreWebView2Frame* sender,
-                                   ICoreWebView2ExperimentalPermissionRequestedEventArgs* args)
+                                   ICoreWebView2PermissionRequestedEventArgs2* args)
                                       -> HRESULT {
                                         // If we set Handled to true, then we will not fire the PermissionRequested
                                         // event off of the CoreWebView2.
@@ -154,9 +154,9 @@ ScenarioIFrameDevicePermission::ScenarioIFrameDevicePermission(AppWindow* appWin
 
 ScenarioIFrameDevicePermission::~ScenarioIFrameDevicePermission()
 {
-    if (m_experimentalFrame3)
+    if (m_frame3)
     {
-        CHECK_FAILURE(m_experimentalFrame3->remove_PermissionRequested(m_PermissionRequestedToken));
+        CHECK_FAILURE(m_frame3->remove_PermissionRequested(m_PermissionRequestedToken));
     }
     if (m_webView4)
     {

SampleApps/WebView2APISample/ScenarioIFrameDevicePermission.h

@@ -22,7 +22,7 @@ class ScenarioIFrameDevicePermission : public ComponentBase
     wil::com_ptr<ICoreWebView2_4> m_webView4;
     std::map<std::tuple<std::wstring, COREWEBVIEW2_PERMISSION_KIND, BOOL>, bool>
         m_cached_permissions;
-    wil::com_ptr<ICoreWebView2ExperimentalFrame3> m_experimentalFrame3;
+    wil::com_ptr<ICoreWebView2Frame3> m_frame3;
     std::wstring m_sampleUri;
     EventRegistrationToken m_FrameCreatedToken = {};
     EventRegistrationToken m_ContentLoadingToken = {};