Fix Voice Access 'Show Bubbles' annotation of WebView2 Content (#8551)

* wv2 changes * Make IRawElementProviderFragmentRoot::GetFocus return S_OK instead of E_NOTIMPL * Add null check to _Outptr_opt_ arg of GetRawElementProviderSimple --------- Co-authored-by: Ranjesh Jaganathan <[email protected]>
microsoft · Jun 22, 2023 · 2422301 · 2422301
1 parent e30572d
commit 2422301
Show file tree

Hide file tree

Showing 2 changed files with 30 additions and 11 deletions.
diff --git a/dev/WebView2/WebView2AutomationPeer.cpp b/dev/WebView2/WebView2AutomationPeer.cpp
@@ -42,17 +42,27 @@ winrt::Rect WebView2AutomationPeer::GetBoundingRectangleCore()
     return boundingRect;
 }
 
-#if WINUI3
 HRESULT WebView2AutomationPeer::GetRawElementProviderSimple(_Outptr_opt_ IRawElementProviderSimple** value)
 {
+    if (value == nullptr) return S_OK;
+
+    *value = nullptr;
+
     InitProvider();
-    m_provider.copy_to(value);
+
+    auto wrapperSimple = m_providerWrapper.try_as<IRawElementProviderSimple>();
+    if (wrapperSimple)
+    {
+        wrapperSimple.copy_to(value);
+    }
+
     return S_OK;
 }
 
 HRESULT WebView2AutomationPeer::IsCorrectPeerForHwnd(HWND hwnd, _Out_ bool* value)
 {
     *value = false;
+
     if (!InitProvider())
     {
         return S_OK;
@@ -63,9 +73,9 @@ HRESULT WebView2AutomationPeer::IsCorrectPeerForHwnd(HWND hwnd, _Out_ bool* valu
     {
         *value = true;
     }
+
     return S_OK;
 }
-#endif
 
 struct ProviderWrapper : winrt::implements<ProviderWrapper, winrt::IInspectable, ::IRawElementProviderSimple, ::IRawElementProviderSimple2, ::IRawElementProviderFragment, ::IRawElementProviderFragmentRoot>
 {
@@ -212,7 +222,10 @@ struct ProviderWrapper : winrt::implements<ProviderWrapper, winrt::IInspectable,
     HRESULT STDMETHODCALLTYPE GetFocus(
         /* [retval][out] */ __RPC__deref_out_opt IRawElementProviderFragment** pRetVal) noexcept override
     {
-        return E_NOTIMPL;
+            // We don't answer the question about a current focus. We return NULL here since if we return
+            // an error UIA will bail out the entire focus operation rather than continueing its search.
+            *pRetVal = nullptr;
+            return S_OK;
     }
 
 private:

diff --git a/dev/WebView2/WebView2AutomationPeer.h b/dev/WebView2/WebView2AutomationPeer.h
@@ -7,12 +7,20 @@
 #include "WebView2.h"
 #include "UIAutomationCore.h"
 
+MIDL_INTERFACE("865F5B88-6506-4E64-A4C5-4B7723650731")
+IAutomationPeerHwndInterop : public IUnknown
+{
+public:
+    virtual /* [propput] */ HRESULT STDMETHODCALLTYPE GetRawElementProviderSimple(
+        /* [retval][out] */ _Outptr_opt_ IRawElementProviderSimple * *value) = 0;
+
+    virtual /* [propget] */ HRESULT STDMETHODCALLTYPE IsCorrectPeerForHwnd(
+                            HWND hwnd,
+        /* [retval][out] */ _Out_ bool* value) = 0;
+};
+
 class WebView2AutomationPeer :
-    public ReferenceTracker<WebView2AutomationPeer, winrt::implementation::WebView2AutomationPeerT
-#if WINUI3
-    , IAutomationPeerHwndInterop
-#endif
-    >
+    public ReferenceTracker<WebView2AutomationPeer, winrt::implementation::WebView2AutomationPeerT, IAutomationPeerHwndInterop>
 {
 public:
     WebView2AutomationPeer(winrt::WebView2 const& owner);
@@ -27,10 +35,8 @@ class WebView2AutomationPeer :
     winrt::IInspectable GetElementFromPointCore(winrt::Point pointInWindowCoordinates);
 
     // IAutomationPeerHwndInterop
-#if WINUI3
     HRESULT STDMETHODCALLTYPE GetRawElementProviderSimple(_Outptr_opt_ IRawElementProviderSimple** value);
     HRESULT STDMETHODCALLTYPE IsCorrectPeerForHwnd(HWND hwnd, _Out_ bool* value);
-#endif
 
 private:
     com_ptr<WebView2> GetImpl();