mirror/JUCE
1
0
Fork 0
mirror of https://github.com/juce-framework/JUCE.git synced 2026-01-09 23:34:20 +00:00
Code Activity

WebBrowserComponent: Fix Windows compilation issue

Browse source
This commit is contained in:
attila 2024-04-18 15:47:24 +02:00
parent 19061e6d17
commit e86e7fca9e
3 changed files with 6 additions and 7 deletions
Download patch file Download diff file Expand all files Collapse all files

1
docs/CMake API.md
View file

@ -4,7 +4,6 @@
- All project types require CMake 3.22 or higher.
- Android targets are not currently supported.
- WebView2 on Windows via JUCE_USE_WIN_WEBVIEW2 flag in juce_gui_extra is not currently supported.
Most system package managers have packages for CMake, but we recommend using the most recent release
from https://cmake.org/download. You should always use a CMake that's newer than your build

2
extras/Build/CMake/FindWebView2.cmake
View file

@ -79,7 +79,7 @@ find_package_handle_standard_args(WebView2 DEFAULT_MSG WebView2_include_dir WebV
if(WebView2_FOUND)
set(WebView2_INCLUDE_DIRS ${WebView2_include_dir})
set(WebView2_LIBRARIES ${WebView2_library} )
set(WebView2_LIBRARIES ${WebView2_library})
mark_as_advanced(WebView2_library WebView2_include_dir WebView2_root_dir)

10
modules/juce_gui_extra/native/juce_WebBrowserComponent_windows.cpp
View file

@ -663,7 +663,7 @@ public:
Callback<ICoreWebView2CreateCoreWebView2EnvironmentCompletedHandler> (
[&result] (HRESULT, ICoreWebView2Environment* env) -> HRESULT
{
result.environment = env;
result.environment = addComSmartPtrOwner (env);
return S_OK;
}).Get());
@ -827,7 +827,7 @@ private:
{
method = "POST";
ComSmartPtr<IStream> content (SHCreateMemStream ((BYTE*) urlRequest.postData.getData(),
auto content = becomeComSmartPtrOwner (SHCreateMemStream ((BYTE*) urlRequest.postData.getData(),
(UINT) urlRequest.postData.getSize()));
request->put_Content (content);
}
@ -854,8 +854,8 @@ private:
{
if (auto responseData = owner.impl->handleResourceRequest (resourceRequestUri))
{
ComSmartPtr<IStream> stream (SHCreateMemStream ((BYTE*) responseData->data.data(),
(UINT) responseData->data.size()));
auto stream = becomeComSmartPtrOwner (SHCreateMemStream ((BYTE*) responseData->data.data(),
(UINT) responseData->data.size()));
StringArray headers { "Content-Type: " + responseData->mimeType };
@ -1035,7 +1035,7 @@ private:
if (controller != nullptr)
{
weakThis->webViewController = controller;
weakThis->webViewController = addComSmartPtrOwner (controller);
controller->get_CoreWebView2 (weakThis->webView.resetAndGetPointerAddress());
auto allUserScripts = weakThis->userScripts;