-
Notifications
You must be signed in to change notification settings - Fork 472
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Update projects to use latest WebView2 SDK 1.0.2646-prerelease (#247)
* Updates for Win32, WPF, WinForms, UWP and WinUI3 sample apps from 128.0.2646.0 * Updated package version for Win32, WPF and WinForms sample apps to 1.0.2646-prerelease --------- Co-authored-by: WebView2 Github Bot <[email protected]>
- Loading branch information
1 parent
906135e
commit 02a1ccb
Showing
16 changed files
with
697 additions
and
25 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
116 changes: 116 additions & 0 deletions
116
SampleApps/WebView2APISample/ScenarioFileTypePolicy.cpp
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,116 @@ | ||
| // Copyright (C) Microsoft Corporation. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "stdafx.h" | ||
|
|
||
| #include "AppWindow.h" | ||
| #include "CheckFailure.h" | ||
| #include "ScenarioFileTypePolicy.h" | ||
|
|
||
| using namespace Microsoft::WRL; | ||
|
|
||
| static constexpr WCHAR c_samplePath[] = L"SecnarioFileTypePolicy.html"; | ||
|
|
||
| ScenarioFileTypePolicy::ScenarioFileTypePolicy(AppWindow* appWindow) | ||
| : m_appWindow(appWindow), m_webView2(appWindow->GetWebView()) | ||
| { | ||
| if (m_webView2) | ||
| { | ||
| m_webView2Experimental27 = m_webView2.try_query<ICoreWebView2Experimental27>(); | ||
| m_webView2_2 = m_webView2.try_query<ICoreWebView2_2>(); | ||
|
|
||
| m_sampleUri = m_appWindow->GetLocalUri(c_samplePath); | ||
| CHECK_FAILURE(m_webView2->Navigate(m_sampleUri.c_str())); | ||
| SuppressPolicyForExtension(); | ||
|
|
||
| // Turn off this scenario if we navigate away from the demo page. | ||
| CHECK_FAILURE(m_webView2_2->add_DOMContentLoaded( | ||
| Callback<ICoreWebView2DOMContentLoadedEventHandler>( | ||
| [this](ICoreWebView2* sender, ICoreWebView2DOMContentLoadedEventArgs* args) | ||
| -> HRESULT | ||
| { | ||
| wil::unique_cotaskmem_string uri; | ||
| sender->get_Source(&uri); | ||
| if (uri.get() != m_sampleUri) | ||
| m_appWindow->DeleteComponent(this); | ||
| return S_OK; | ||
| }) | ||
| .Get(), | ||
| &m_DOMcontentLoadedToken)); | ||
| } | ||
| } | ||
|
|
||
| //! [SuppressPolicyForExtension] | ||
| // This example will register the event with two custom rules. | ||
| // 1. Suppressing file type policy, security dialog, and allows saving ".eml" files | ||
| // directly. | ||
| // 2. When the URI is trusted.- Showing customized warning UI when saving ".iso" | ||
| // files. It allows to block the saving directly. | ||
| bool ScenarioFileTypePolicy::SuppressPolicyForExtension() | ||
| { | ||
| if (!m_webView2Experimental27) | ||
| return false; | ||
| m_webView2Experimental27->add_SaveFileSecurityCheckStarting( | ||
| Callback<ICoreWebView2ExperimentalSaveFileSecurityCheckStartingEventHandler>( | ||
| [this]( | ||
| ICoreWebView2* sender, | ||
| ICoreWebView2ExperimentalSaveFileSecurityCheckStartingEventArgs* args) | ||
| -> HRESULT | ||
| { | ||
| // Get the file extension for file to be saved. | ||
| // And convert the extension to lower case for a | ||
| // case-insensitive comparasion. | ||
| wil::unique_cotaskmem_string extension; | ||
| CHECK_FAILURE(args->get_FileExtension(&extension)); | ||
| std::wstring extension_lower = extension.get(); | ||
| std::transform( | ||
| extension_lower.begin(), extension_lower.end(), extension_lower.begin(), | ||
| ::towlower); | ||
|
|
||
| // Suppress default policy for ".eml" file. | ||
| if (wcscmp(extension_lower.c_str(), L".eml") == 0) | ||
| { | ||
| CHECK_FAILURE(args->put_SuppressDefaultPolicy(TRUE)); | ||
| } | ||
|
|
||
| // Cancel save/download for ".iso" file. | ||
| if (wcscmp(extension_lower.c_str(), L".iso") == 0) | ||
| { | ||
| wil::com_ptr<ICoreWebView2Deferral> deferral; | ||
| CHECK_FAILURE(args->GetDeferral(&deferral)); | ||
|
|
||
| m_appWindow->RunAsync( | ||
| [this, args = wil::make_com_ptr(args), deferral]() | ||
| { | ||
| // With the deferral, the cancel decision and | ||
| // message box can be replaced with a customized UI. | ||
| CHECK_FAILURE(args->put_CancelSave(TRUE)); | ||
| MessageBox( | ||
| m_appWindow->GetMainWindow(), L"The saving has been blocked", | ||
| L"Info", MB_OK); | ||
| CHECK_FAILURE(deferral->Complete()); | ||
| }); | ||
| } | ||
| return S_OK; | ||
| }) | ||
| .Get(), | ||
| &m_saveFileSecurityCheckStartingToken); | ||
|
|
||
| MessageBox( | ||
| m_appWindow->GetMainWindow(), | ||
| (L"Example rules of Dangerous File Security Policy has been applied in this demo page"), | ||
| L"Info", MB_OK); | ||
| return true; | ||
| } | ||
| //! [SuppressPolicyForExtension] | ||
|
|
||
| ScenarioFileTypePolicy::~ScenarioFileTypePolicy() | ||
| { | ||
| if (m_webView2Experimental27) | ||
| { | ||
| CHECK_FAILURE(m_webView2Experimental27->remove_SaveFileSecurityCheckStarting( | ||
| m_saveFileSecurityCheckStartingToken)); | ||
| } | ||
| CHECK_FAILURE(m_webView2_2->remove_DOMContentLoaded(m_DOMcontentLoadedToken)); | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,28 @@ | ||
| // Copyright (C) Microsoft Corporation. All rights reserved. | ||
| // Use of this source code is governed by a BSD-style license that can be | ||
| // found in the LICENSE file. | ||
|
|
||
| #include "stdafx.h" | ||
|
|
||
| #include <string> | ||
|
|
||
| #include "AppWindow.h" | ||
| #include "ComponentBase.h" | ||
|
|
||
| class ScenarioFileTypePolicy : public ComponentBase | ||
| { | ||
| public: | ||
| ScenarioFileTypePolicy(AppWindow* appWindow); | ||
| ~ScenarioFileTypePolicy(); | ||
|
|
||
| private: | ||
| bool SuppressPolicyForExtension(); | ||
|
|
||
| AppWindow* m_appWindow; | ||
| wil::com_ptr<ICoreWebView2> m_webView2; | ||
| wil::com_ptr<ICoreWebView2_2> m_webView2_2; | ||
| wil::com_ptr<ICoreWebView2Experimental27> m_webView2Experimental27; | ||
| EventRegistrationToken m_saveFileSecurityCheckStartingToken = {}; | ||
| EventRegistrationToken m_DOMcontentLoadedToken = {}; | ||
| std::wstring m_sampleUri; | ||
| }; |
Oops, something went wrong.
02a1ccbThere was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Hi, I don't know if this problem only happens to me but I run this project on my visual studio in debug mode, then this exception comes up.
It seems that a experimental interface is no longer supported in the new prerelease of webview2 sdk?
Then I revert the code to last commit and everything works fine.