Smoketest/1.0.1083 prerelease testing (#113)

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

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

* Disable transparent on Win7 and add AudioComponent
https://microsoft.visualstudio.com/Edge/_git/chromium.src/pullrequest/6700976?discussionId=49416487&path=/third_party/edge_webview2/win/WebView2APISample/ViewComponent.cpp
https://microsoft.visualstudio.com/Edge/_git/chromium.src/pullrequest/6701751

Co-authored-by: WebView2 Github Bot <webview2github@microsoft.com>

Author: lichen63

SampleApps/WebView2APISample/AppWindow.cpp

@@ -42,7 +42,6 @@
 #include "SettingsComponent.h"
 #include "TextInputDialog.h"
 #include "ViewComponent.h"
-
 using namespace Microsoft::WRL;
 static constexpr size_t s_maxLoadString = 100;
 static constexpr UINT s_runAsyncWindowMessage = WM_APP;
@@ -562,7 +561,6 @@ bool AppWindow::ExecuteWebViewCommands(WPARAM wParam, LPARAM lParam)
     }
     return false;
 }
-
 // Handle commands not related to the WebView, which will work even if the WebView
 // is not currently initialized.
 bool AppWindow::ExecuteAppCommands(WPARAM wParam, LPARAM lParam)
@@ -904,6 +902,7 @@ HRESULT AppWindow::OnCreateEnvironmentCompleted(
 
 HRESULT AppWindow::CreateControllerWithOptions()
 {
+    //! [CreateControllerWithOptions]
     auto webViewEnvironment8 =
         m_webViewEnvironment.try_query<ICoreWebView2ExperimentalEnvironment8>();
     if (!webViewEnvironment8)
@@ -922,6 +921,7 @@ HRESULT AppWindow::CreateControllerWithOptions()
         return S_OK;
     }
     CHECK_FAILURE(hr);
+    //! [CreateControllerWithOptions]
 
 #ifdef USE_WEBVIEW2_WIN10
     if (m_dcompDevice || m_wincompCompositor)
@@ -1002,6 +1002,7 @@ HRESULT AppWindow::OnCreateCoreWebView2ControllerCompleted(HRESULT result, ICore
         // ProcessFailed event could have been raised yet) so the PID is
         // available.
         CHECK_FAILURE(m_webView->get_BrowserProcessId(&m_newestBrowserPid));
+        //! [CoreWebView2Profile]
         auto webview2Experimental8 = coreWebView2.try_query<ICoreWebView2Experimental8>();
         if (webview2Experimental8)
         {
@@ -1019,6 +1020,7 @@ HRESULT AppWindow::OnCreateCoreWebView2ControllerCompleted(HRESULT result, ICore
             // update window icon
             SetAppIcon(inPrivate);
         }
+        //! [CoreWebView2Profile]
         // Create components. These will be deleted when the WebView is closed.
         NewComponent<FileComponent>(this);
         NewComponent<ProcessComponent>(this);
@@ -1032,6 +1034,7 @@ HRESULT AppWindow::OnCreateCoreWebView2ControllerCompleted(HRESULT result, ICore
             m_wincompCompositor,
 #endif
             m_creationModeId == IDM_CREATION_MODE_TARGET_DCOMP);
+        NewComponent<AudioComponent>(this);
         NewComponent<ControlComponent>(this, &m_toolbar);
         m_webView3 = coreWebView2.try_query<ICoreWebView2_3>();
         if (m_webView3)

SampleApps/WebView2APISample/AudioComponent.cpp

@@ -9,28 +9,30 @@
 
 using namespace Microsoft::WRL;
 
-//! [IsDocumentPlayingAudioChanged] [IsDocumentPlayingAudio] [ToggleIsMuted]
+//! [IsDocumentPlayingAudioChanged] [IsDocumentPlayingAudio] [IsMutedChanged] [ToggleIsMuted]
 AudioComponent::AudioComponent(AppWindow* appWindow)
     : m_appWindow(appWindow), m_webView(appWindow->GetWebView())
 {
-    auto webviewExperimental9 = m_webView.try_query<ICoreWebView2Experimental9>();
-    if (webviewExperimental9)
+    auto webview2_8 = m_webView.try_query<ICoreWebView2_8>();
+    if (webview2_8)
     {
         // Register a handler for the IsDocumentPlayingAudioChanged event.
-        CHECK_FAILURE(webviewExperimental9->add_IsDocumentPlayingAudioChanged(
-            Callback<ICoreWebView2ExperimentalIsDocumentPlayingAudioChangedEventHandler>(
-                [this, webviewExperimental9](ICoreWebView2* sender, IUnknown* args) -> HRESULT {
-                    UpdateTitleWithMuteState(webviewExperimental9);
+        CHECK_FAILURE(webview2_8->add_IsDocumentPlayingAudioChanged(
+            Callback<ICoreWebView2IsDocumentPlayingAudioChangedEventHandler>(
+                [this, webview2_8](ICoreWebView2* sender, IUnknown* args) -> HRESULT
+                {
+                    UpdateTitleWithMuteState(webview2_8);
                     return S_OK;
                 })
                 .Get(),
             &m_isDocumentPlayingAudioChangedToken));
 
         // Register a handler for the IsMutedChanged event.
-        CHECK_FAILURE(webviewExperimental9->add_IsMutedChanged(
-            Callback<ICoreWebView2ExperimentalIsMutedChangedEventHandler>(
-                [this, webviewExperimental9](ICoreWebView2* sender, IUnknown* args) -> HRESULT {
-                    UpdateTitleWithMuteState(webviewExperimental9);
+        CHECK_FAILURE(webview2_8->add_IsMutedChanged(
+            Callback<ICoreWebView2IsMutedChangedEventHandler>(
+                [this, webview2_8](ICoreWebView2* sender, IUnknown* args) -> HRESULT
+                {
+                    UpdateTitleWithMuteState(webview2_8);
                     return S_OK;
                 })
                 .Get(),
@@ -56,23 +58,22 @@ bool AudioComponent::HandleWindowMessage(
 // Toggle the mute state of the current window and show a mute or unmute icon on the title bar
 void AudioComponent::ToggleMuteState()
 {
-    auto webviewExperimental9 = m_webView.try_query<ICoreWebView2Experimental9>();
-    if (webviewExperimental9)
+    auto webview2_8 = m_webView.try_query<ICoreWebView2_8>();
+    if (webview2_8)
      {
          BOOL isMuted;
-         CHECK_FAILURE(webviewExperimental9->get_IsMuted(&isMuted));
-         CHECK_FAILURE(webviewExperimental9->put_IsMuted(!isMuted));
+         CHECK_FAILURE(webview2_8->get_IsMuted(&isMuted));
+         CHECK_FAILURE(webview2_8->put_IsMuted(!isMuted));
      }
  }
 
- void AudioComponent::UpdateTitleWithMuteState(
-     wil::com_ptr<ICoreWebView2Experimental9> webviewExperimental9)
+ void AudioComponent::UpdateTitleWithMuteState(wil::com_ptr<ICoreWebView2_8> webview2_8)
  {
      BOOL isDocumentPlayingAudio;
-     CHECK_FAILURE(webviewExperimental9->get_IsDocumentPlayingAudio(&isDocumentPlayingAudio));
+     CHECK_FAILURE(webview2_8->get_IsDocumentPlayingAudio(&isDocumentPlayingAudio));
 
      BOOL isMuted;
-     CHECK_FAILURE(webviewExperimental9->get_IsMuted(&isMuted));
+     CHECK_FAILURE(webview2_8->get_IsMuted(&isMuted));
 
      wil::unique_cotaskmem_string title;
      CHECK_FAILURE(m_webView->get_DocumentTitle(&title));
@@ -96,15 +97,15 @@ void AudioComponent::ToggleMuteState()
 
      m_appWindow->SetDocumentTitle(result.c_str());
  }
- //! [IsDocumentPlayingAudioChanged] [IsDocumentPlayingAudio] [ToggleIsMuted]
+ //! [IsDocumentPlayingAudioChanged] [IsDocumentPlayingAudio] [IsMutedChanged] [ToggleIsMuted]
 
  AudioComponent::~AudioComponent()
  {
-     auto webviewExperimental9 = m_webView.try_query<ICoreWebView2Experimental9>();
-     if (webviewExperimental9)
+     auto webview2_8 = m_webView.try_query<ICoreWebView2_8>();
+     if (webview2_8)
      {
-         CHECK_FAILURE(webviewExperimental9->remove_IsDocumentPlayingAudioChanged(
+         CHECK_FAILURE(webview2_8->remove_IsDocumentPlayingAudioChanged(
              m_isDocumentPlayingAudioChangedToken));
-         CHECK_FAILURE(webviewExperimental9->remove_IsMutedChanged(m_isMutedChangedToken));
+         CHECK_FAILURE(webview2_8->remove_IsMutedChanged(m_isMutedChangedToken));
     }
 }

SampleApps/WebView2APISample/AudioComponent.h

@@ -21,8 +21,7 @@ class AudioComponent : public ComponentBase
         LRESULT* result) override;
 
     void ToggleMuteState();
-    void UpdateTitleWithMuteState(
-        wil::com_ptr<ICoreWebView2Experimental9> webviewExperimental9);
+    void UpdateTitleWithMuteState(wil::com_ptr<ICoreWebView2_8> webview2_8);
 
     ~AudioComponent() override;
 

SampleApps/WebView2APISample/CheckFailure.h

@@ -32,3 +32,6 @@ void FeatureNotAvailable();
 
 // Wraps the above in a conditional.
 #define CHECK_FEATURE_RETURN(feature) { if (!feature) { FeatureNotAvailable(); return true; } }
+
+// Returns nothing, which is different from CHECK_FEATURE_RETURN
+#define CHECK_FEATURE_RETURN_EMPTY(feature) { if (!feature) { FeatureNotAvailable(); return; } }

SampleApps/WebView2APISample/ProcessComponent.cpp

@@ -121,6 +121,27 @@ ProcessComponent::ProcessComponent(AppWindow* appWindow)
             .Get(),
         &m_processFailedToken));
     //! [ProcessFailed]
+
+    m_webViewEnvironment = appWindow->GetWebViewEnvironment();
+    auto environment9 = m_webViewEnvironment.try_query<ICoreWebView2ExperimentalEnvironment9>();
+    if (environment9)
+    {
+        CHECK_FAILURE(environment9->GetProcessInfos(&m_processCollection));
+        // Register a handler for the ProcessInfosChanged event.
+        //! [ProcessInfosChanged]
+        CHECK_FAILURE(environment9->add_ProcessInfosChanged(
+            Callback<ICoreWebView2ExperimentalProcessInfosChangedEventHandler>(
+                [this](ICoreWebView2Environment* sender, IUnknown* args) -> HRESULT {
+                    wil::com_ptr<ICoreWebView2ExperimentalEnvironment9> webviewEnvironment;
+                    sender->QueryInterface(IID_PPV_ARGS(&webviewEnvironment));
+                    CHECK_FAILURE(
+                        webviewEnvironment->GetProcessInfos(&m_processCollection));
+                    return S_OK;
+                })
+                .Get(),
+            &m_processInfosChangedToken));
+        //! [ProcessInfosChanged]
+    }
 }
 
 // static
@@ -156,10 +177,14 @@ bool ProcessComponent::HandleWindowMessage(
         case IDM_CRASH_RENDER_PROCESS:
             CrashRenderProcess();
             return true;
+        case IDM_PERFORMANCE_INFO:
+            PerformanceInfo();
+            return true;
         }
     }
     return false;
 }
+
 // Show the WebView's PID to the user.
 void ProcessComponent::ShowBrowserProcessInfo() {
     UINT32 processId;
@@ -220,6 +245,29 @@ std::wstring ProcessComponent::ProcessFailedReasonToString(
     return L"REASON: " + std::to_wstring(static_cast<uint32_t>(reason));
 }
 
+// Get a string for the process kind enum value.
+std::wstring ProcessComponent::ProcessKindToString(const COREWEBVIEW2_PROCESS_KIND kind)
+{
+    switch (kind)
+    {
+#define KIND_ENTRY(kindValue)                                                                  \
+    case kindValue:                                                                            \
+        return L#kindValue;
+
+        KIND_ENTRY(COREWEBVIEW2_PROCESS_KIND_BROWSER);
+        KIND_ENTRY(COREWEBVIEW2_PROCESS_KIND_RENDERER);
+        KIND_ENTRY(COREWEBVIEW2_PROCESS_KIND_UTILITY);
+        KIND_ENTRY(COREWEBVIEW2_PROCESS_KIND_SANDBOX_HELPER);
+        KIND_ENTRY(COREWEBVIEW2_PROCESS_KIND_GPU);
+        KIND_ENTRY(COREWEBVIEW2_PROCESS_KIND_PPAPI_PLUGIN);
+        KIND_ENTRY(COREWEBVIEW2_PROCESS_KIND_PPAPI_BROKER);
+
+#undef KIND_ENTRY
+    }
+
+    return L"PROCESS KIND: " + std::to_wstring(static_cast<uint32_t>(kind));
+}
+
 // Crash the browser's process on command, to test crash handlers.
 void ProcessComponent::CrashBrowserProcess()
 {
@@ -232,11 +280,52 @@ void ProcessComponent::CrashRenderProcess()
     m_webView->Navigate(L"edge://kill");
 }
 
-//! [ProcessInfoChanged]
+//! [ProcessInfosChanged]
 void ProcessComponent::PerformanceInfo()
 {
+    std::wstring result;
+    UINT processListCount;
+    CHECK_FAILURE(m_processCollection->get_Count(&processListCount));
+
+    if (processListCount == 0)
+    {
+        result += L"No process found.";
+    }
+    else
+    {
+        result += std::to_wstring(processListCount) + L" process(s) found";
+        result += L"\n\n";
+        for (UINT i = 0; i < processListCount; ++i)
+        {
+            wil::com_ptr<ICoreWebView2ExperimentalProcessInfo> processInfo;
+            CHECK_FAILURE(m_processCollection->GetValueAtIndex(i, &processInfo));
+
+            INT32 processId = 0;
+            COREWEBVIEW2_PROCESS_KIND kind;
+            CHECK_FAILURE(processInfo->get_ProcessId(&processId));
+            CHECK_FAILURE(processInfo->get_Kind(&kind));
+
+            WCHAR id[4096] = L"";
+            StringCchPrintf(id, ARRAYSIZE(id), L"Process ID: %u", processId);
+
+            HANDLE processHandle =
+                OpenProcess(PROCESS_QUERY_LIMITED_INFORMATION, FALSE, processId);
+            PROCESS_MEMORY_COUNTERS_EX pmc;
+            GetProcessMemoryInfo(
+                processHandle, reinterpret_cast<PROCESS_MEMORY_COUNTERS*>(&pmc), sizeof(pmc));
+            SIZE_T virtualMemUsed = pmc.PrivateUsage / 1024;
+            WCHAR memory[4096] = L"";
+            StringCchPrintf(memory, ARRAYSIZE(memory), L"Memory: %u", virtualMemUsed);
+            CloseHandle(processHandle);
+
+            result = result + id + L" | Process Kind: " + ProcessKindToString(kind) + L" | " +
+                     memory + L" KB\n";
+        }
+    }
+    MessageBox(nullptr, result.c_str(), L"Memory Usage", MB_OK);
 }
-//! [ProcessInfoChanged]
+//! [ProcessInfosChanged]
+
 /*static*/ void ProcessComponent::EnsureProcessIsClosed(UINT processId, int timeoutMs)
 {
     UINT exitCode = 1;
@@ -285,4 +374,9 @@ void ProcessComponent::ScheduleReloadIfSelectedByUser(
 ProcessComponent::~ProcessComponent()
 {
     m_webView->remove_ProcessFailed(m_processFailedToken);
+    auto environment9 = m_webViewEnvironment.try_query<ICoreWebView2ExperimentalEnvironment9>();
+    if (environment9)
+    {
+        environment9->remove_ProcessInfosChanged(m_processInfosChangedToken);
+    }
 }

SampleApps/WebView2APISample/ProcessComponent.h

@@ -28,9 +28,11 @@ class ProcessComponent : public ComponentBase
     void ShowBrowserProcessInfo();
     std::wstring ProcessFailedKindToString(const COREWEBVIEW2_PROCESS_FAILED_KIND kind);
     std::wstring ProcessFailedReasonToString(const COREWEBVIEW2_PROCESS_FAILED_REASON reason);
+    std::wstring ProcessKindToString(const COREWEBVIEW2_PROCESS_KIND kind);
     void CrashBrowserProcess();
     void CrashRenderProcess();
     void PerformanceInfo();
+
     ~ProcessComponent() override;
 
     // Wait for process to exit for timeoutMs, then force quit it if it hasn't.
@@ -47,6 +49,8 @@ class ProcessComponent : public ComponentBase
     wil::com_ptr<ICoreWebView2Environment> m_webViewEnvironment;
 
     UINT m_browserProcessId = 0;
+    wil::com_ptr<ICoreWebView2ExperimentalProcessInfoCollection> m_processCollection;
+
     EventRegistrationToken m_processFailedToken = {};
-    EventRegistrationToken m_processInfoChangedToken = {};
+    EventRegistrationToken m_processInfosChangedToken = {};
 };

SampleApps/WebView2APISample/ScenarioAddHostObject.cpp

@@ -141,5 +141,8 @@ ScenarioAddHostObject::~ScenarioAddHostObject()
     m_webView->RemoveHostObjectFromScript(L"sample");
     m_webView->remove_NavigationStarting(m_navigationStartingToken);
     wil::com_ptr<ICoreWebView2_4> webview2_4 = m_webView.try_query<ICoreWebView2_4>();
-    if (webview2_4) webview2_4->remove_FrameCreated(m_frameCreatedToken);
+    if (webview2_4)
+    {
+        webview2_4->remove_FrameCreated(m_frameCreatedToken);
+    }
 }

SampleApps/WebView2APISample/ScenarioAuthentication.cpp

@@ -46,7 +46,7 @@ ScenarioAuthentication::ScenarioAuthentication(AppWindow* appWindow) :
         &m_webResourceResponseReceivedToken));
     //! [WebResourceResponseReceived]
 
-    //! [AuthRequested]
+    //! [BasicAuthenticationRequested]
     if (auto webViewExperimental10 = m_webView.try_query<ICoreWebView2Experimental10>())
     {
         CHECK_FAILURE(webViewExperimental10->add_BasicAuthenticationRequested(
@@ -67,7 +67,7 @@ ScenarioAuthentication::ScenarioAuthentication(AppWindow* appWindow) :
     else {
         FeatureNotAvailable();
     }
-    //! [AuthRequested]
+    //! [BasicAuthenticationRequested]
     CHECK_FAILURE(m_webView->Navigate(L"https://authenticationtest.com/HTTPAuth/"));
 }
 

SampleApps/WebView2APISample/ScenarioCookieManagement.cpp

@@ -20,7 +20,7 @@ ScenarioCookieManagement::ScenarioCookieManagement(AppWindow* appWindow)
 {
     m_sampleUri = m_appWindow->GetLocalUri(c_samplePath);
 
-    ComPtr<ICoreWebView2Settings> settings;
+    wil::com_ptr<ICoreWebView2Settings> settings;
     CHECK_FAILURE(m_webView->get_Settings(&settings));
     CHECK_FAILURE(settings->put_IsWebMessageEnabled(TRUE));
 
@@ -30,6 +30,13 @@ ScenarioCookieManagement::ScenarioCookieManagement(AppWindow* appWindow)
     CHECK_FAILURE(m_webview2->get_CookieManager(&m_cookieManager));
     //! [CookieManager]
 
+    SetupEventsOnWebview();
+
+    CHECK_FAILURE(m_webView->Navigate(m_sampleUri.c_str()));
+}
+
+void ScenarioCookieManagement::SetupEventsOnWebview()
+{
     // Setup the web message received event handler before navigating to
     // ensure we don't miss any messages.
     CHECK_FAILURE(m_webView->add_WebMessageReceived(
@@ -90,8 +97,6 @@ ScenarioCookieManagement::ScenarioCookieManagement(AppWindow* appWindow)
             })
             .Get(),
         &m_contentLoadingToken));
-
-    CHECK_FAILURE(m_webView->Navigate(m_sampleUri.c_str()));
 }
 
 ScenarioCookieManagement::~ScenarioCookieManagement()

SampleApps/WebView2APISample/ScenarioCookieManagement.h

@@ -18,6 +18,7 @@ class ScenarioCookieManagement : public ComponentBase
 
 private:
     void GetCookiesHelper(std::wstring uri);
+    void SetupEventsOnWebview();
 
     AppWindow* m_appWindow;
     wil::com_ptr<ICoreWebView2Environment> m_webViewEnvironment;