Amebis/wxWidgets
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Add wxLogApiError() to important WebView2 API calls

Browse Source
This commit is contained in:
Tobias Taschner
2020-01-15 17:04:51 +01:00
parent 903279a9af
commit 0d00af5913
1 changed files with 17 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
src/msw/webview_edge.cpp
View File

@@ -78,11 +78,14 @@ bool wxWebViewEdge::Initialize()
// Check if a Edge browser can be found by the loader DLL // Check if a Edge browser can be found by the loader DLL
LPWSTR versionStr; LPWSTR versionStr;
if (SUCCEEDED(wxGetWebView2BrowserVersionInfo(NULL, &versionStr))) HRESULT hr = wxGetWebView2BrowserVersionInfo(NULL, &versionStr);
if (SUCCEEDED(hr))
{ {
if (versionStr) if (versionStr)
return true; return true;
} }
else
wxLogApiError("GetWebView2BrowserVersionInfo", hr);
return false; return false;
} }
@@ -157,7 +160,12 @@ bool wxWebViewEdge::Create(wxWindow* parent,
.Get()); .Get());
return S_OK; return S_OK;
}).Get()); }).Get());
return SUCCEEDED(hr); if (FAILED(hr))
{
wxLogApiError("CreateWebView2EnvironmentWithDetails", hr);
}
else
return true;
} }
void wxWebViewEdge::InitWebViewCtrl() void wxWebViewEdge::InitWebViewCtrl()
@@ -676,7 +684,13 @@ bool wxWebViewEdge::RunScriptSync(const wxString& javascript, wxString* output)
while (!scriptExecuted) while (!scriptExecuted)
wxYield(); wxYield();
return SUCCEEDED(hr); if (FAILED(hr))
{
wxLogApiError("ExecuteScript", hr);
return false;
}
else
return true;
} }
bool wxWebViewEdge::RunScript(const wxString& javascript, wxString* output) bool wxWebViewEdge::RunScript(const wxString& javascript, wxString* output)