From 861920924264964808ed3806853fef84455ad5ef Mon Sep 17 00:00:00 2001 From: Jessica Chen <55165503+peiche-jessica@users.noreply.github.com> Date: Wed, 18 Oct 2023 10:51:51 -0700 Subject: [PATCH] Update projects to use latest WebView2 SDK 1.0.2164-prerelease (#220) * Updates for Win32, WPF and WinForms sample apps from 120.0.2164.0 * Updated package version for Win32, WPF and WinForms sample apps to 1.0.2164-prerelease --------- Co-authored-by: WebView2 Github Bot --- .../WebView2APISample/ProcessComponent.cpp | 16 +++++++++--- .../WebView2APISample/ScriptComponent.cpp | 1 - .../WebView2APISample/ScriptComponent.h | 1 - .../WebView2APISample.vcxproj | 26 +++++++++---------- SampleApps/WebView2APISample/packages.config | 2 +- .../WebView2WindowsFormsBrowser.csproj | 2 +- .../WebView2WpfBrowser.csproj | 2 +- .../Html/ScenarioTypeScriptDebugIndex.ts | 2 +- .../webview2_sample_uwp/Pages/Browser.xaml.cs | 25 ------------------ SampleApps/webview2_sample_uwp/Settings.cs | 5 ---- 10 files changed, 30 insertions(+), 52 deletions(-) diff --git a/SampleApps/WebView2APISample/ProcessComponent.cpp b/SampleApps/WebView2APISample/ProcessComponent.cpp index e46eace4..9919d1b1 100644 --- a/SampleApps/WebView2APISample/ProcessComponent.cpp +++ b/SampleApps/WebView2APISample/ProcessComponent.cpp @@ -53,7 +53,7 @@ ProcessComponent::ProcessComponent(AppWindow* appWindow) // needed. ScheduleReloadIfSelectedByUser( L"Browser render process exited unexpectedly. Reload page?", - L"Web page unresponsive"); + L"Render process exited"); } // Check the runtime event args implements the newer interface. auto args2 = args.try_query(); @@ -100,17 +100,27 @@ ProcessComponent::ProcessComponent(AppWindow* appWindow) COREWEBVIEW2_PROCESS_FAILED_REASON reason; wil::unique_cotaskmem_string processDescription; int exitCode; + wil::unique_cotaskmem_string failedModule; CHECK_FAILURE(args2->get_Reason(&reason)); CHECK_FAILURE(args2->get_ProcessDescription(&processDescription)); CHECK_FAILURE(args2->get_ExitCode(&exitCode)); + auto argFailedModule = + args.try_query(); + if (argFailedModule) + { + CHECK_FAILURE( + argFailedModule->get_FailureSourceModulePath(&failedModule)); + } + std::wstringstream message; message << L"Kind: " << ProcessFailedKindToString(kind) << L"\n" << L"Reason: " << ProcessFailedReasonToString(reason) << L"\n" << L"Exit code: " << exitCode << L"\n" - << L"Process description: " << processDescription.get() - << std::endl; + << L"Process description: " << processDescription.get() << std::endl + << (failedModule ? L"Failed module: " : L"") + << (failedModule ? failedModule.get() : L""); m_appWindow->AsyncMessageBox( std::move(message.str()), L"Child process failed"); } return S_OK; diff --git a/SampleApps/WebView2APISample/ScriptComponent.cpp b/SampleApps/WebView2APISample/ScriptComponent.cpp index e0d97166..ff1d15f8 100644 --- a/SampleApps/WebView2APISample/ScriptComponent.cpp +++ b/SampleApps/WebView2APISample/ScriptComponent.cpp @@ -172,7 +172,6 @@ bool ScriptComponent::HandleWindowMessage( } return false; } - void ScriptComponent::AddBrowserExtension() { diff --git a/SampleApps/WebView2APISample/ScriptComponent.h b/SampleApps/WebView2APISample/ScriptComponent.h index 35f315fb..da36df91 100644 --- a/SampleApps/WebView2APISample/ScriptComponent.h +++ b/SampleApps/WebView2APISample/ScriptComponent.h @@ -51,7 +51,6 @@ class ScriptComponent : public ComponentBase void AddBrowserExtension(); void RemoveOrDisableBrowserExtension(const bool remove); ~ScriptComponent() override; - void HandleIFrames(); std::wstring IFramesToString(); std::vector> m_frames; diff --git a/SampleApps/WebView2APISample/WebView2APISample.vcxproj b/SampleApps/WebView2APISample/WebView2APISample.vcxproj index 25807ebb..3b26458a 100644 --- a/SampleApps/WebView2APISample/WebView2APISample.vcxproj +++ b/SampleApps/WebView2APISample/WebView2APISample.vcxproj @@ -126,8 +126,8 @@ ProgramDatabase Disabled stdcpp17 - true - + true + MachineX86 true @@ -145,8 +145,8 @@ Level3 ProgramDatabase stdcpp17 - true - + true + MachineX86 true @@ -162,8 +162,8 @@ MultiThreadedDebug stdcpp17 USE_WEBVIEW2_WIN10;_UNICODE;UNICODE;%(PreprocessorDefinitions) - true - + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;Gdiplus.lib;%(AdditionalDependencies) onecoreuap.lib %(AdditionalOptions) @@ -174,8 +174,8 @@ MultiThreaded stdcpp17 USE_WEBVIEW2_WIN10;_UNICODE;UNICODE;%(PreprocessorDefinitions) - true - + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;Gdiplus.lib;%(AdditionalDependencies) @@ -188,8 +188,8 @@ MultiThreadedDebug stdcpp17 USE_WEBVIEW2_WIN10;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) - true - + true + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;Gdiplus.lib;%(AdditionalDependencies) onecoreuap.lib %(AdditionalOptions) @@ -201,7 +201,7 @@ stdcpp17 USE_WEBVIEW2_WIN10;_ARM64_WINAPI_PARTITION_DESKTOP_SDK_AVAILABLE=1;%(ClCompile.PreprocessorDefinitions) true - + kernel32.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;shlwapi.lib;ole32.lib;oleaut32.lib;uuid.lib;odbc32.lib;odbccp32.lib;urlmon.lib;Gdiplus.lib;%(AdditionalDependencies) onecoreuap.lib %(AdditionalOptions) @@ -425,13 +425,13 @@ - + This project references NuGet package(s) that are missing on this computer. Use NuGet Package Restore to download them. For more information, see http://go.microsoft.com/fwlink/?LinkID=322105. The missing file is {0}. - + diff --git a/SampleApps/WebView2APISample/packages.config b/SampleApps/WebView2APISample/packages.config index bc1d08b1..05d0b86e 100644 --- a/SampleApps/WebView2APISample/packages.config +++ b/SampleApps/WebView2APISample/packages.config @@ -1,5 +1,5 @@  - + \ No newline at end of file diff --git a/SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj b/SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj index d20a1ae9..02c7fb55 100644 --- a/SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj +++ b/SampleApps/WebView2WindowsFormsBrowser/WebView2WindowsFormsBrowser.csproj @@ -25,7 +25,7 @@ AnyCPU - + diff --git a/SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj b/SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj index bf5c3375..b0c6a1a5 100644 --- a/SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj +++ b/SampleApps/WebView2WpfBrowser/WebView2WpfBrowser.csproj @@ -61,7 +61,7 @@ - + diff --git a/SampleApps/webview2_sample_uwp/Html/ScenarioTypeScriptDebugIndex.ts b/SampleApps/webview2_sample_uwp/Html/ScenarioTypeScriptDebugIndex.ts index ce914d0b..cfcd27cc 100644 --- a/SampleApps/webview2_sample_uwp/Html/ScenarioTypeScriptDebugIndex.ts +++ b/SampleApps/webview2_sample_uwp/Html/ScenarioTypeScriptDebugIndex.ts @@ -1,7 +1,7 @@ function onHeaderClick() { console.log("onHeaderClick+"); const header = document.getElementById('header'); - document.getElementById('HeaderSpace').innerHTML = header.innerHTML; + document.getElementById('HeaderSpace').textContent = header.textContent; console.log("onHeaderClick-"); } diff --git a/SampleApps/webview2_sample_uwp/Pages/Browser.xaml.cs b/SampleApps/webview2_sample_uwp/Pages/Browser.xaml.cs index 3cd55fc5..59727436 100644 --- a/SampleApps/webview2_sample_uwp/Pages/Browser.xaml.cs +++ b/SampleApps/webview2_sample_uwp/Pages/Browser.xaml.cs @@ -10,13 +10,9 @@ using System.Diagnostics; using System.IO; using webview2_sample_uwp; -#if USE_WEBVIEW2_SMOKETEST -using Windows.Storage; -#endif using Windows.UI.Xaml; using Windows.UI.Xaml.Controls; using Windows.UI.Xaml.Input; - namespace WebView2_UWP.Pages { public sealed partial class Browser : BasePage @@ -36,22 +32,11 @@ public Browser() WebView2.Source = new Uri(AddressBar.Text); } -#if USE_WEBVIEW2_SMOKETEST - private async void WebView2_CoreWebView2Initialized(WebView2 sender, CoreWebView2InitializedEventArgs args) -#else private void WebView2_CoreWebView2Initialized(WebView2 sender, CoreWebView2InitializedEventArgs args) -#endif { if (args.Exception != null) { StatusUpdate($"Error initializing WebView2: {args.Exception.Message}"); - -#if USE_WEBVIEW2_SMOKETEST - StorageFolder localFolder = ApplicationData.Current.LocalFolder; - StorageFile file = await localFolder.CreateFileAsync(@"Failure.txt", CreationCollisionOption.FailIfExists); - await FileIO.WriteTextAsync(file, args.Exception.ToString()); - Environment.Exit(1); -#endif } else { @@ -152,11 +137,7 @@ private void WebView2_NavigationStarting(WebView2 sender, CoreWebView2Navigation CancelButton.IsEnabled = true; } -#if USE_WEBVIEW2_SMOKETEST - private async void WebView2_NavigationCompleted(WebView2 sender, CoreWebView2NavigationCompletedEventArgs args) -#else private void WebView2_NavigationCompleted(WebView2 sender, CoreWebView2NavigationCompletedEventArgs args) -#endif { StatusUpdate("Navigation complete"); @@ -165,12 +146,6 @@ private void WebView2_NavigationCompleted(WebView2 sender, CoreWebView2Navigatio // Update the address bar with the full URL that was navigated to. AddressBar.Text = sender.Source.ToString(); - -#if USE_WEBVIEW2_SMOKETEST - StorageFolder localFolder = ApplicationData.Current.LocalFolder; - await localFolder.CreateFileAsync(@"Success.txt", CreationCollisionOption.FailIfExists); - Environment.Exit(0); -#endif } private bool TryCreateUri(String potentialUri, out Uri result) diff --git a/SampleApps/webview2_sample_uwp/Settings.cs b/SampleApps/webview2_sample_uwp/Settings.cs index a28df8d0..ef00ae3c 100644 --- a/SampleApps/webview2_sample_uwp/Settings.cs +++ b/SampleApps/webview2_sample_uwp/Settings.cs @@ -48,12 +48,7 @@ public Settings() _localSettings[SettingsVersionKey] = SettingsVersion; } -#if USE_WEBVIEW2_SMOKETEST - var webViewExecutableFolder = ApplicationData.Current.LocalFolder.Path + "\\EdgeBin"; - Environment.SetEnvironmentVariable(WebViewExecutableFolderEnvKey, webViewExecutableFolder); -#else InitializeEnvSetting(WebViewExecutableFolderKey, WebViewExecutableFolderEnvKey); -#endif InitializeEnvSetting(WebViewUserDataFolderKey, WebViewUserDataFolderEnvKey); InitializeEnvSetting(WebViewReleaseChannelPrefKey, WebViewReleaseChannelPrefEnvKey); InitializeEnvSetting(WebViewAdditionalArgumentsKey, WebViewAdditionalArgumentsEnvKey);