Smoketest/1.0.1189 testing (#123)

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

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

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

Author: oggy22

SampleApps/WebView2APISample/App.cpp

@@ -25,24 +25,21 @@ static int RunMessagePump();
 static DWORD WINAPI ThreadProc(void* pvParam);
 static void WaitForOtherThreads();
 
-#define NEXT_PARAM_CONTAINS(command) \
+#define NEXT_PARAM_CONTAINS(command)                                                           \
     _wcsnicmp(nextParam.c_str(), command, ARRAYSIZE(command) - 1) == 0
 
-int APIENTRY wWinMain(HINSTANCE hInstance,
-                      HINSTANCE hPrevInstance,
-                      PWSTR lpCmdLine,
-                      int nCmdShow)
+int APIENTRY
+wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdLine, int nCmdShow)
 {
     g_hInstance = hInstance;
     UNREFERENCED_PARAMETER(hPrevInstance);
     g_nCmdShow = nCmdShow;
 
     // Default DPI awareness to PerMonitorV2. The commandline parameters can
     // override this.
-    DPI_AWARENESS_CONTEXT dpiAwarenessContext =
-        DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
+    DPI_AWARENESS_CONTEXT dpiAwarenessContext = DPI_AWARENESS_CONTEXT_PER_MONITOR_AWARE_V2;
     std::wstring appId(L"EBWebView.SampleApp");
-    std::wstring userDirectoryFolder(L"");
+    std::wstring userDataFolder(L"");
     std::wstring initialUri;
     DWORD creationModeId = IDM_CREATION_MODE_WINDOWED;
 
@@ -92,9 +89,9 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
             {
                 initialUri = nextParam.substr(nextParam.find(L'=') + 1);
             }
-            else if (NEXT_PARAM_CONTAINS(L"userdirectoryfolder="))
+            else if (NEXT_PARAM_CONTAINS(L"userdatafolder="))
             {
-                userDirectoryFolder = nextParam.substr(nextParam.find(L'=') + 1);
+                userDataFolder = nextParam.substr(nextParam.find(L'=') + 1);
             }
             else if (NEXT_PARAM_CONTAINS(L"creationmode="))
             {
@@ -125,7 +122,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
 
     DpiUtil::SetProcessDpiAwarenessContext(dpiAwarenessContext);
 
-    new AppWindow(creationModeId, WebViewCreateOption(), initialUri, userDirectoryFolder, true);
+    new AppWindow(creationModeId, WebViewCreateOption(), initialUri, userDataFolder, true);
 
     int retVal = RunMessagePump();
 
@@ -137,8 +134,7 @@ int APIENTRY wWinMain(HINSTANCE hInstance,
 // Run the message pump for one thread.
 static int RunMessagePump()
 {
-    HACCEL hAccelTable =
-        LoadAccelerators(g_hInstance, MAKEINTRESOURCE(IDC_WEBVIEW2APISAMPLE));
+    HACCEL hAccelTable = LoadAccelerators(g_hInstance, MAKEINTRESOURCE(IDC_WEBVIEW2APISAMPLE));
 
     MSG msg;
 
@@ -206,8 +202,8 @@ static void WaitForOtherThreads()
 
         HANDLE* handleArray = threadHandles.data();
         DWORD dwIndex = MsgWaitForMultipleObjects(
-            static_cast<DWORD>(threadHandles.size()), threadHandles.data(), FALSE,
-            INFINITE, QS_ALLEVENTS);
+            static_cast<DWORD>(threadHandles.size()), threadHandles.data(), FALSE, INFINITE,
+            QS_ALLEVENTS);
 
         if (dwIndex == WAIT_OBJECT_0 + threadHandles.size())
         {

SampleApps/WebView2APISample/AppWindow.cpp

@@ -613,7 +613,7 @@ bool AppWindow::ExecuteAppCommands(WPARAM wParam, LPARAM lParam)
         CHECK_FEATURE_RETURN(experimentalEnvironment3);
         HRESULT hr = experimentalEnvironment3->UpdateRuntime(
             Callback<ICoreWebView2ExperimentalUpdateRuntimeCompletedHandler>(
-                [](HRESULT errorCode,
+                [this](HRESULT errorCode,
                    ICoreWebView2ExperimentalUpdateRuntimeResult* result) -> HRESULT {
                     HRESULT updateError = E_FAIL;
                     COREWEBVIEW2_UPDATE_RUNTIME_STATUS status =
@@ -627,12 +627,12 @@ bool AppWindow::ExecuteAppCommands(WPARAM wParam, LPARAM lParam)
                     formattedMessage << "UpdateRuntime result (0x" << std::hex << errorCode
                                      << "), status(" << status << "), extendedError("
                                      << updateError << ")";
-                    MessageBox(nullptr, formattedMessage.str().c_str(), nullptr, MB_OK);
+                    AsyncMessageBox(std::move(formattedMessage.str()), L"UpdateRuntimeResult");
                     return S_OK;
                 })
                 .Get());
         if (FAILED(hr))
-            ShowFailure(hr, L"Call to TryUpdateRuntime failed");
+            ShowFailure(hr, L"Call to UpdateRuntime failed");
         //! [UpdateRuntime]
         return true;
     }
@@ -730,11 +730,8 @@ bool AppWindow::ClearBrowsingData(COREWEBVIEW2_BROWSING_DATA_KINDS dataKinds)
     CHECK_FAILURE(webView2ExperimentalProfile4->ClearBrowsingDataInTimeRange(
         dataKinds, startTime, endTime,
         Callback<ICoreWebView2ExperimentalClearBrowsingDataCompletedHandler>(
-            [this](HRESULT error)
-                -> HRESULT {
-                RunAsync([this]() {
-                    MessageBox(nullptr, L"Completed", L"Clear Browsing Data", MB_OK);
-                });
+            [this](HRESULT error) -> HRESULT {
+                AsyncMessageBox(L"Completed", L"Clear Browsing Data");
                 return S_OK;
             })
             .Get()));
@@ -877,7 +874,7 @@ void AppWindow::InitializeWebView()
     }
 #endif
     //! [CreateCoreWebView2EnvironmentWithOptions]
-    auto options = Microsoft::WRL::Make<CoreWebView2ExperimentalEnvironmentOptions>();
+    auto options = Microsoft::WRL::Make<CoreWebView2EnvironmentOptions>();
     CHECK_FAILURE(
         options->put_AllowSingleSignOnUsingOSPrimaryAccount(
         m_AADSSOEnabled ? TRUE : FALSE));
@@ -1153,6 +1150,11 @@ HRESULT AppWindow::OnCreateCoreWebView2ControllerCompleted(HRESULT result, ICore
             CHECK_FAILURE(m_webView->Navigate(initialUri.c_str()));
         }
     }
+    else if (result == E_ABORT)
+    {
+        // Webview creation was aborted because the user closed this window.
+        // No need to report this as an error.
+    }
     else
     {
         ShowFailure(result, L"Failed to create webview");
@@ -1349,29 +1351,33 @@ void AppWindow::RegisterEventHandlers()
     CHECK_FAILURE(m_webViewEnvironment->add_NewBrowserVersionAvailable(
         Callback<ICoreWebView2NewBrowserVersionAvailableEventHandler>(
             [this](ICoreWebView2Environment* sender, IUnknown* args) -> HRESULT {
-                std::wstring message = L"We detected there is a new version for the browser.";
-                if (m_webView)
+                 // Don't block the event handler with a message box
+                RunAsync([this]
                 {
-                    message += L"Do you want to restart the app? \n\n";
-                    message += L"Click No if you only want to re-create the webviews. \n";
-                    message += L"Click Cancel for no action. \n";
-                }
-                int response = MessageBox(
-                    m_mainWindow, message.c_str(), L"New available version",
-                    m_webView ? MB_YESNOCANCEL : MB_OK);
+                    std::wstring message = L"We detected there is a new version for the browser.";
+                    if (m_webView)
+                    {
+                        message += L"Do you want to restart the app? \n\n";
+                        message += L"Click No if you only want to re-create the webviews. \n";
+                        message += L"Click Cancel for no action. \n";
+                    }
+                    int response = MessageBox(
+                        m_mainWindow, message.c_str(), L"New available version",
+                        m_webView ? MB_YESNOCANCEL : MB_OK);
 
-                if (response == IDYES)
-                {
-                    RestartApp();
-                }
-                else if (response == IDNO)
-                {
-                    ReinitializeWebViewWithNewBrowser();
-                }
-                else
-                {
-                    // do nothing
-                }
+                    if (response == IDYES)
+                    {
+                        RestartApp();
+                    }
+                    else if (response == IDNO)
+                    {
+                        ReinitializeWebViewWithNewBrowser();
+                    }
+                    else
+                    {
+                        // do nothing
+                    }
+                });
 
                 return S_OK;
             })
@@ -1466,12 +1472,9 @@ bool AppWindow::CloseWebView(bool cleanupUserDataFolder)
                         // The exiting process is not the last in use. Do not attempt cleanup
                         // as we might still have a webview open over the user data folder.
                         // Do not block from event handler.
-                        RunAsync([this]() {
-                            MessageBox(
-                                m_mainWindow,
-                                L"A new browser process prevented cleanup of the user data folder.",
-                                L"Cleanup User Data Folder", MB_OK);
-                        });
+                        AsyncMessageBox(
+                            L"A new browser process prevented cleanup of the user data folder.",
+                            L"Cleanup User Data Folder");
                     }
 
                     return S_OK;
@@ -1692,6 +1695,14 @@ void AppWindow::RunAsync(std::function<void()> callback)
     PostMessage(m_mainWindow, s_runAsyncWindowMessage, reinterpret_cast<WPARAM>(task), 0);
 }
 
+void AppWindow::AsyncMessageBox(std::wstring message, std::wstring title)
+{
+    RunAsync([this, message = std::move(message), title = std::move(title)]
+    {
+        MessageBox(m_mainWindow, message.c_str(), title.c_str(), MB_OK);
+    });
+}
+
 void AppWindow::EnterFullScreen()
 {
     DWORD style = GetWindowLong(m_mainWindow, GWL_STYLE);

SampleApps/WebView2APISample/AppWindow.h

@@ -109,8 +109,18 @@ class AppWindow
 
     void DeleteComponent(ComponentBase* scenario);
 
+    // Runs a function by posting it to the event loop.  Use this to do things
+    // that shouldn't be done in event handlers, like show message boxes.
+    // If you use this in a component, capture a pointer to this AppWindow
+    // instead of the component, because the component could get deleted before
+    // the AppWindow.
     void RunAsync(std::function<void(void)> callback);
 
+    // Calls win32 MessageBox inside RunAsync.  Always uses MB_OK.  If you need
+    // to get the return value from MessageBox, you'll have to use RunAsync
+    // yourself.
+    void AsyncMessageBox(std::wstring message, std::wstring title);
+
     void InstallComplete(int return_code);
 
     void AddRef();

SampleApps/WebView2APISample/ControlComponent.cpp

@@ -119,10 +119,10 @@ ControlComponent::ControlComponent(AppWindow* appWindow, Toolbar* toolbar)
                     // The web page can cancel its own iframe loads, so we'll ignore that.
                     if (webErrorStatus != COREWEBVIEW2_WEB_ERROR_STATUS_OPERATION_CANCELED)
                     {
-                        std::wstring error_msg = WebErrorStatusToString(webErrorStatus);
-                        MessageBox(nullptr,
-                           (std::wstring(L"IFrame navigation failed: ") + error_msg).c_str(),
-                           L"Navigation Failure", MB_OK);
+                        m_appWindow->AsyncMessageBox(
+                            L"Iframe navigation failed: "
+                                + WebErrorStatusToString(webErrorStatus),
+                            L"Navigation Failure");
                     }
                 }
                 return S_OK;
@@ -187,8 +187,8 @@ ControlComponent::ControlComponent(AppWindow* appWindow, Toolbar* toolbar)
                     UINT key;
                     CHECK_FAILURE(args->get_VirtualKey(&key));
                     // Check if the key is one we want to handle.
-                    if (std::function<void()> action =
-                            m_appWindow->GetAcceleratorKeyFunction(key))
+                    std::function<void()> action = m_appWindow->GetAcceleratorKeyFunction(key);
+                    if (action)
                     {
                         // Keep the browser from handling this key, whether it's autorepeated or
                         // not.

SampleApps/WebView2APISample/FileComponent.cpp

@@ -82,15 +82,12 @@ void FileComponent::SaveScreenshot()
             defaultName, STGM_READWRITE | STGM_CREATE, FILE_ATTRIBUTE_NORMAL, TRUE, nullptr,
             &stream));
 
-        HWND mainWindow = m_appWindow->GetMainWindow();
-
         CHECK_FAILURE(m_webView->CapturePreview(
             COREWEBVIEW2_CAPTURE_PREVIEW_IMAGE_FORMAT_PNG, stream.get(),
             Callback<ICoreWebView2CapturePreviewCompletedHandler>(
-                [mainWindow](HRESULT error_code) -> HRESULT {
+                [appWindow{m_appWindow}](HRESULT error_code) -> HRESULT {
                     CHECK_FAILURE(error_code);
-
-                    MessageBox(mainWindow, L"Preview Captured", L"Preview Captured", MB_OK);
+                    appWindow->AsyncMessageBox(L"Preview Captured", L"Preview Captured");
                     return S_OK;
                 })
                 .Get()));
@@ -133,14 +130,10 @@ void FileComponent::PrintToPdf(bool enableLandscape)
                     [this](HRESULT errorCode, BOOL isSuccessful) -> HRESULT {
                         CHECK_FAILURE(errorCode);
                         m_printToPdfInProgress = false;
-                        auto showDialog = [isSuccessful] {
-                            MessageBox(
-                                nullptr,
-                                (isSuccessful) ? L"Print to PDF succeeded"
-                                               : L"Print to PDF failed",
-                                L"Print to PDF Completed", MB_OK);
-                        };
-                        m_appWindow->RunAsync([showDialog]() { showDialog(); });
+                        m_appWindow->AsyncMessageBox(
+                            (isSuccessful) ? L"Print to PDF succeeded"
+                                           : L"Print to PDF failed",
+                            L"Print to PDF Completed");
                         return S_OK;
                     })
                     .Get()));

SampleApps/WebView2APISample/ProcessComponent.cpp

@@ -110,11 +110,7 @@ ProcessComponent::ProcessComponent(AppWindow* appWindow)
                             << L"Reason: "              << ProcessFailedReasonToString(reason) << L"\n"
                             << L"Exit code: "           << std::to_wstring(exitCode) << L"\n"
                             << L"Process description: " << processDescription.get() << std::endl;
-                    m_appWindow->RunAsync([this, message = message.str()]() {
-                        MessageBox(
-                            m_appWindow->GetMainWindow(), message.c_str(),
-                            L"Child process failed", MB_OK);
-                    });
+                    m_appWindow->AsyncMessageBox( std::move(message.str()), L"Child process failed");
                 }
                 return S_OK;
             })

SampleApps/WebView2APISample/ScenarioAuthentication.cpp

@@ -33,9 +33,9 @@ ScenarioAuthentication::ScenarioAuthentication(AppWindow* appWindow) :
                     wil::unique_cotaskmem_string authHeaderValue;
                     if (requestHeaders->GetHeader(L"Authorization", &authHeaderValue) == S_OK)
                     {
-                        std::wstring message(L"Authorization: ");
-                        message += authHeaderValue.get();
-                        MessageBox(nullptr, message.c_str(), nullptr, MB_OK);
+                        m_appWindow->AsyncMessageBox(
+                            std::wstring(L"Authorization: ") + authHeaderValue.get(),
+                            L"Authentication result");
                         m_appWindow->DeleteComponent(this);
                     }
                 }

SampleApps/WebView2APISample/ScenarioCookieManagement.cpp

@@ -224,7 +224,7 @@ void ScenarioCookieManagement::GetCookiesHelper(std::wstring uri)
                         }
                         result += L"]";
                     }
-                    MessageBox(nullptr, result.c_str(), L"GetCookies Result", MB_OK);
+                    m_appWindow->AsyncMessageBox(std::move(result), L"GetCookies Result");
                     return S_OK;
                 })
                 .Get()));