Update projects to use the latest WebView2 SDK 1.0.824-prerelease

Author: Ognjen Sobajic

SampleApps/WebView2APISample/.gitignore

@@ -28,3 +28,6 @@ packages/
 
 # Make sure script debug config is checked in for vendor testing
 !.vscode
+
+# Nuget.exe is downloaded by UseNuget.ps1
+nuget.exe

SampleApps/WebView2APISample/AppStartPage.cpp

@@ -100,7 +100,7 @@ std::wstring GetRuntimePath(AppWindow* appWindow)
 
 std::wstring GetUri(AppWindow* appWindow)
 {
-    std::wstring uri = appWindow->GetLocalUri(L"AppStartPage.html");
+    std::wstring uri = appWindow->GetLocalUri(L"AppStartPage.html", true);
 
     uri += L"?sdkBuild=";
     uri += GetSdkBuild();

SampleApps/WebView2APISample/AppWindow.cpp

@@ -398,15 +398,30 @@ bool AppWindow::ExecuteWebViewCommands(WPARAM wParam, LPARAM lParam)
     case IDM_SCENARIO_JAVA_SCRIPT:
     {
         WCHAR c_scriptPath[] = L"ScenarioJavaScriptDebugIndex.html";
-        std::wstring m_scriptUri = GetLocalUri(c_scriptPath);
+        std::wstring m_scriptUri = GetLocalUri(c_scriptPath, false);
         CHECK_FAILURE(m_webView->Navigate(m_scriptUri.c_str()));
         return true;
     }
     case IDM_SCENARIO_TYPE_SCRIPT:
     {
         WCHAR c_scriptPath[] = L"ScenarioTypeScriptDebugIndex.html";
-        std::wstring m_scriptUri = GetLocalUri(c_scriptPath);
+        std::wstring m_scriptUri = GetLocalUri(c_scriptPath, false);
         CHECK_FAILURE(m_webView->Navigate(m_scriptUri.c_str()));
+        return true;
+    }
+    case IDM_SCENARIO_JAVA_SCRIPT_VIRTUAL:
+    {
+        WCHAR c_scriptPath[] = L"ScenarioJavaScriptDebugIndex.html";
+        std::wstring m_scriptUri = GetLocalUri(c_scriptPath, true);
+        CHECK_FAILURE(m_webView->Navigate(m_scriptUri.c_str()));
+        return true;
+    }
+    case IDM_SCENARIO_TYPE_SCRIPT_VIRTUAL:
+    {
+        WCHAR c_scriptPath[] = L"ScenarioTypeScriptDebugIndex.html";
+        std::wstring m_scriptUri = GetLocalUri(c_scriptPath, true);
+        CHECK_FAILURE(m_webView->Navigate(m_scriptUri.c_str()));
+        return true;
     }
     case IDM_SCENARIO_AUTHENTICATION:
     {
@@ -429,6 +444,13 @@ bool AppWindow::ExecuteWebViewCommands(WPARAM wParam, LPARAM lParam)
         NewComponent<ScenarioNavigateWithWebResourceRequest>(this);
         return true;
     }
+    case IDM_SCENARIO_TESTING_FOCUS:
+    {
+        WCHAR testingFocusPath[] = L"ScenarioTestingFocus.html";
+        std::wstring testingFocusUri = GetLocalUri(testingFocusPath, false);
+        CHECK_FAILURE(m_webView->Navigate(testingFocusUri.c_str()));
+        return true;
+    }
     }
     return false;
 }
@@ -996,6 +1018,7 @@ void AppWindow::CloseWebView(bool cleanupUserDataFolder)
         m_controller->Close();
         m_controller = nullptr;
         m_webView = nullptr;
+        m_webView3 = nullptr;
     }
     m_webViewEnvironment = nullptr;
     if (cleanupUserDataFolder)
@@ -1120,9 +1143,11 @@ std::wstring AppWindow::GetLocalPath(std::wstring relativePath, bool keep_exe_pa
     }
     return path;
 }
-std::wstring AppWindow::GetLocalUri(std::wstring relativePath)
+
+std::wstring AppWindow::GetLocalUri(
+    std::wstring relativePath, bool useVirtualHostName /*= true*/)
 {
-    if (m_webView3)
+    if (useVirtualHostName && m_webView3)
     {
         //! [LocalUrlUsage]
         const std::wstring localFileRootUrl = L"https://appassets.example/";

SampleApps/WebView2APISample/AppWindow.h

@@ -55,7 +55,7 @@ class AppWindow
     }
     void SetTitleText(PCWSTR titleText);
     RECT GetWindowBounds();
-    std::wstring GetLocalUri(std::wstring path);
+    std::wstring GetLocalUri(std::wstring path, bool useVirtualHostName = true);
     std::function<void()> GetAcceleratorKeyFunction(UINT key);
     double GetDpiScale();
     double GetTextScale();

SampleApps/WebView2APISample/ProcessComponent.cpp

@@ -6,6 +6,8 @@
 
 #include "ProcessComponent.h"
 
+#include <sstream>
+
 #include "CheckFailure.h"
 
 using namespace Microsoft::WRL;
@@ -15,54 +17,56 @@ ProcessComponent::ProcessComponent(AppWindow* appWindow)
 {
     //! [ProcessFailed]
     // Register a handler for the ProcessFailed event.
-    // This handler checks if the browser process failed, and asks the user if
-    // they want to recreate the webview.
+    // This handler checks the failure kind and tries to:
+    //   * Recreate the webview for browser failure and render unresponsive.
+    //   * Reload the webview for render failure.
     CHECK_FAILURE(m_webView->add_ProcessFailed(
         Callback<ICoreWebView2ProcessFailedEventHandler>(
-            [this](ICoreWebView2* sender,
-                ICoreWebView2ProcessFailedEventArgs* args) -> HRESULT
-    {
-        COREWEBVIEW2_PROCESS_FAILED_KIND failureType;
-        CHECK_FAILURE(args->get_ProcessFailedKind(&failureType));
-        if (failureType == COREWEBVIEW2_PROCESS_FAILED_KIND_BROWSER_PROCESS_EXITED)
-        {
-            int button = MessageBox(
-                m_appWindow->GetMainWindow(),
-                L"Browser process exited unexpectedly.  Recreate webview?",
-                L"Browser process exited",
-                MB_YESNO);
-            if (button == IDYES)
-            {
-                m_appWindow->ReinitializeWebView();
-            }
-        }
-        else if (failureType == COREWEBVIEW2_PROCESS_FAILED_KIND_RENDER_PROCESS_UNRESPONSIVE)
-        {
-            int button = MessageBox(
-                m_appWindow->GetMainWindow(),
-                L"Browser render process has stopped responding.  Recreate webview?",
-                L"Web page unresponsive", MB_YESNO);
-            if (button == IDYES)
-            {
-                m_appWindow->ReinitializeWebView();
-            }
-        }
-        else if (failureType == COREWEBVIEW2_PROCESS_FAILED_KIND_RENDER_PROCESS_EXITED)
-        {
-            int button = MessageBox(
-                m_appWindow->GetMainWindow(),
-                L"Browser render process exited unexpectedly. Reload page?",
-                L"Web page unresponsive", MB_YESNO);
-            if (button == IDYES)
-            {
-                CHECK_FAILURE(m_webView->Reload());
-            }
-        }
-        return S_OK;
-    }).Get(), &m_processFailedToken));
+            [this](ICoreWebView2* sender, ICoreWebView2ProcessFailedEventArgs* argsRaw)
+                -> HRESULT {
+                wil::com_ptr<ICoreWebView2ProcessFailedEventArgs> args = argsRaw;
+                COREWEBVIEW2_PROCESS_FAILED_KIND failureKind;
+                CHECK_FAILURE(args->get_ProcessFailedKind(&failureKind));
+                if (failureKind == COREWEBVIEW2_PROCESS_FAILED_KIND_BROWSER_PROCESS_EXITED)
+                {
+                    int button = MessageBox(
+                        m_appWindow->GetMainWindow(),
+                        L"Browser process exited unexpectedly.  Recreate webview?",
+                        L"Browser process exited", MB_YESNO);
+                    if (button == IDYES)
+                    {
+                        m_appWindow->ReinitializeWebView();
+                    }
+                }
+                else if (
+                    failureKind == COREWEBVIEW2_PROCESS_FAILED_KIND_RENDER_PROCESS_UNRESPONSIVE)
+                {
+                    int button = MessageBox(
+                        m_appWindow->GetMainWindow(),
+                        L"Browser render process has stopped responding.  Recreate webview?",
+                        L"Web page unresponsive", MB_YESNO);
+                    if (button == IDYES)
+                    {
+                        m_appWindow->ReinitializeWebView();
+                    }
+                }
+                else if (failureKind == COREWEBVIEW2_PROCESS_FAILED_KIND_RENDER_PROCESS_EXITED)
+                {
+                    int button = MessageBox(
+                        m_appWindow->GetMainWindow(),
+                        L"Browser render process exited unexpectedly. Reload page?",
+                        L"Web page unresponsive", MB_YESNO);
+                    if (button == IDYES)
+                    {
+                        CHECK_FAILURE(m_webView->Reload());
+                    }
+                }
+                return S_OK;
+            })
+            .Get(),
+        &m_processFailedToken));
     //! [ProcessFailed]
 }
-
 bool ProcessComponent::HandleWindowMessage(
     HWND hWnd,
     UINT message,
@@ -97,7 +101,6 @@ void ProcessComponent::ShowBrowserProcessInfo() {
     StringCchPrintf(buffer, ARRAYSIZE(buffer), L"Process ID: %u\n", processId);
     MessageBox(m_appWindow->GetMainWindow(), buffer, L"Process Info", MB_OK);
 }
-
 // Crash the browser's process on command, to test crash handlers.
 void ProcessComponent::CrashBrowserProcess()
 {

SampleApps/WebView2APISample/ProcessComponent.h

@@ -26,7 +26,6 @@ class ProcessComponent : public ComponentBase
     void ShowBrowserProcessInfo();
     void CrashBrowserProcess();
     void CrashRenderProcess();
-
     ~ProcessComponent() override;
 
     // Wait for process to exit for timeoutMs, then force quit it if it hasn't.
@@ -39,4 +38,3 @@ class ProcessComponent : public ComponentBase
     UINT m_browserProcessId = 0;
     EventRegistrationToken m_processFailedToken = {};
 };
-

SampleApps/WebView2APISample/SettingsComponent.cpp

@@ -23,6 +23,7 @@ SettingsComponent::SettingsComponent(
 {
     CHECK_FAILURE(m_webView->get_Settings(&m_settings));
 
+    m_settings2 = m_settings.try_query<ICoreWebView2Settings2>();
     // Copy old settings if desired
     if (old)
     {
@@ -37,16 +38,11 @@ SettingsComponent::SettingsComponent(
         CHECK_FAILURE(m_settings->put_IsStatusBarEnabled(setting));
         CHECK_FAILURE(old->m_settings->get_AreDevToolsEnabled(&setting));
         CHECK_FAILURE(m_settings->put_AreDevToolsEnabled(setting));
-        wil::com_ptr<ICoreWebView2ExperimentalSettings> experimental_settings_old;
-        experimental_settings_old =
-            old->m_settings.try_query<ICoreWebView2ExperimentalSettings>();
-        wil::com_ptr<ICoreWebView2ExperimentalSettings> experimental_settings_new;
-        experimental_settings_new = m_settings.try_query<ICoreWebView2ExperimentalSettings>();
-        if (experimental_settings_old && experimental_settings_new)
+        if (old->m_settings2 && m_settings2)
         {
             LPWSTR user_agent;
-            CHECK_FAILURE(experimental_settings_old->get_UserAgent(&user_agent));
-            CHECK_FAILURE(experimental_settings_new->put_UserAgent(user_agent));
+            CHECK_FAILURE(old->m_settings2->get_UserAgent(&user_agent));
+            CHECK_FAILURE(m_settings2->put_UserAgent(user_agent));
         }
         SetBlockImages(old->m_blockImages);
         SetReplaceImages(old->m_replaceImages);
@@ -55,7 +51,6 @@ SettingsComponent::SettingsComponent(
         m_blockedSitesSet = old->m_blockedSitesSet;
         m_blockedSites = std::move(old->m_blockedSites);
     }
-
     //! [NavigationStarting]
     // Register a handler for the NavigationStarting event.
     // This handler will check the domain being navigated to, and if the domain
@@ -98,16 +93,18 @@ SettingsComponent::SettingsComponent(
                 }
                 //! [IsScriptEnabled]
                 //! [UserAgent]
-                static const PCWSTR url_compare_example = L"fourthcoffee.com";
-                wil::unique_bstr domain = GetDomainOfUri(uri.get());
-                const wchar_t* domains = domain.get();
-
-                if (wcscmp(url_compare_example, domains) == 0)
+                if (m_settings2)
                 {
-                    SetUserAgent(L"example_navigation_ua");
+                    static const PCWSTR url_compare_example = L"fourthcoffee.com";
+                    wil::unique_bstr domain = GetDomainOfUri(uri.get());
+                    const wchar_t* domains = domain.get();
+
+                    if (wcscmp(url_compare_example, domains) == 0)
+                    {
+                        SetUserAgent(L"example_navigation_ua");
+                    }
                 }
                 //! [UserAgent]
-
                 return S_OK;
             })
             .Get(),
@@ -244,6 +241,7 @@ bool SettingsComponent::HandleWindowMessage(
         }
         case ID_SETTINGS_SETUSERAGENT:
         {
+            CHECK_FEATURE_RETURN(m_settings2);
             ChangeUserAgent();
             return true;
         }
@@ -478,20 +476,10 @@ bool SettingsComponent::HandleWindowMessage(
             //! [BuiltInErrorPageEnabled]
             return true;
         }
-        case ID_SETTINGS_USER_AGENT_STRING:
-        {
-            LPWSTR user_agent;
-            wil::com_ptr<ICoreWebView2ExperimentalSettings> settings;
-            settings = m_settings.try_query<ICoreWebView2ExperimentalSettings>();
-            CHECK_FAILURE(settings->get_UserAgent(&user_agent));
-            CHECK_FAILURE(settings->put_UserAgent(L"example_string"));
-            return true;
-        }
         }
     }
     return false;
 }
-
 // Prompt the user for a list of blocked domains
 void SettingsComponent::ChangeBlockedSites()
 {
@@ -661,36 +649,38 @@ void SettingsComponent::SetReplaceImages(bool replaceImages)
 // Prompt the user for a new User Agent string
 void SettingsComponent::ChangeUserAgent()
 {
-    wil::com_ptr<ICoreWebView2ExperimentalSettings> experimental_settings;
-    experimental_settings = m_settings.try_query<ICoreWebView2ExperimentalSettings>();
-    LPWSTR user_agent;
-    CHECK_FAILURE(experimental_settings->get_UserAgent(&user_agent));
-    TextInputDialog dialog(
-        m_appWindow->GetMainWindow(), L"User Agent", L"User agent:",
-        L"Enter user agent, or leave blank to restore default.",
-        m_changeUserAgent ? m_overridingUserAgent.c_str() : user_agent);
-    if (dialog.confirmed)
+    if (m_settings2)
     {
-        SetUserAgent(dialog.input);
+        LPWSTR user_agent;
+        CHECK_FAILURE(m_settings2->get_UserAgent(&user_agent));
+        TextInputDialog dialog(
+            m_appWindow->GetMainWindow(), L"User Agent", L"User agent:",
+            L"Enter user agent, or leave blank to restore default.",
+            m_changeUserAgent ? m_overridingUserAgent.c_str() : user_agent);
+        if (dialog.confirmed)
+        {
+            SetUserAgent(dialog.input);
+        }
     }
 }
 
 // Register a WebResourceRequested handler which adds a custom User-Agent
 // HTTP header to all requests.
 void SettingsComponent::SetUserAgent(const std::wstring& userAgent)
 {
-    m_overridingUserAgent = userAgent;
-    if (m_overridingUserAgent.empty())
-    {
-        m_changeUserAgent = false;
-    }
-    else
+    if (m_settings2)
     {
-        m_changeUserAgent = true;
-        wil::com_ptr<ICoreWebView2ExperimentalSettings> experimental_settings;
-        experimental_settings = m_settings.try_query<ICoreWebView2ExperimentalSettings>();
-        experimental_settings->put_UserAgent(m_overridingUserAgent.c_str());
-    }
+        m_overridingUserAgent = userAgent;
+        if (m_overridingUserAgent.empty())
+        {
+            m_changeUserAgent = false;
+        }
+        else
+        {
+            m_changeUserAgent = true;
+            CHECK_FAILURE(m_settings2->put_UserAgent(m_overridingUserAgent.c_str()));
+        }
+    }   
 }
 
 void SettingsComponent::CompleteScriptDialogDeferral()

SampleApps/WebView2APISample/SettingsComponent.h

@@ -46,6 +46,7 @@ class SettingsComponent : public ComponentBase
     wil::com_ptr<ICoreWebView2Environment> m_webViewEnvironment;
     wil::com_ptr<ICoreWebView2> m_webView;
     wil::com_ptr<ICoreWebView2Settings> m_settings;
+    wil::com_ptr<ICoreWebView2Settings2> m_settings2;
 
     bool m_blockImages = false;
     bool m_replaceImages = false;