Connor McAdams : uiautomationcore: Pass through failure HRESULTS on MSAA accState based property IDs for MSAA providers.

[Alexandre Julliard]

Module: wine
Branch: master
Commit: ef1d5a0e0a70da93b11f55dd93b64b102f44203c
URL:    https://gitlab.winehq.org/wine/wine/-/commit/ef1d5a0e0a70da93b11f55dd93b64b1...

Author: Connor McAdams 
Date:   Tue Sep  5 14:40:33 2023 -0400

uiautomationcore: Pass through failure HRESULTS on MSAA accState based property IDs for MSAA providers.

Signed-off-by: Connor McAdams

---

dlls/uiautomationcore/tests/uiautomation.c |  8 ++++++
 dlls/uiautomationcore/uia_provider.c       | 42 +++++++++++++++++++++---------
 2 files changed, 38 insertions(+), 12 deletions(-)

diff --git a/dlls/uiautomationcore/tests/uiautomation.c b/dlls/uiautomationcore/tests/uiautomation.c
index f396adc1200..dc0048f0c73 100644
--- a/dlls/uiautomationcore/tests/uiautomation.c
+++ b/dlls/uiautomationcore/tests/uiautomation.c
@@ -4476,6 +4476,14 @@ static void test_uia_prov_from_acc_properties(void)
             ok(check_variant_bool(&v, x), "V_BOOL(&v) = %#x\n", V_BOOL(&v));
             CHECK_ACC_METHOD_CALLED(&Accessible, get_accState);
         }
+
+        /* Failure HRESULTs are passed through. */
+        Accessible.state = 0;
+        SET_ACC_METHOD_EXPECT(&Accessible, get_accState);
+        hr = IRawElementProviderSimple_GetPropertyValue(elprov, state->prop_id, &v);
+        ok(hr == E_NOTIMPL, "Unexpected hr %#lx.\n", hr);
+        ok(V_VT(&v) == VT_EMPTY, "Unexpected V_VT %d\n", V_VT(&v));
+        CHECK_ACC_METHOD_CALLED(&Accessible, get_accState);
     }
     Accessible.state = 0;

diff --git a/dlls/uiautomationcore/uia_provider.c b/dlls/uiautomationcore/uia_provider.c
index 729dc7ab2c5..c6483ef5349 100644
--- a/dlls/uiautomationcore/uia_provider.c
+++ b/dlls/uiautomationcore/uia_provider.c
@@ -27,17 +27,23 @@ WINE_DEFAULT_DEBUG_CHANNEL(uiautomation);

DEFINE_GUID(SID_AccFromDAWrapper, 0x33f139ee, 0xe509, 0x47f7, 0xbf,0x39, 0x83,0x76,0x44,0xf7,0x45,0x76);

-static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag)
+/* Returns S_OK if flag is set, S_FALSE if it is not. */
+static HRESULT msaa_check_acc_state_hres(IAccessible *acc, VARIANT cid, ULONG flag)
 {
     HRESULT hr;
     VARIANT v;

VariantInit(&v);
     hr = IAccessible_get_accState(acc, cid, &v);
-    if (SUCCEEDED(hr) && V_VT(&v) == VT_I4 && (V_I4(&v) & flag))
-        return TRUE;
+    if (SUCCEEDED(hr))
+        hr = ((V_VT(&v) == VT_I4) && (V_I4(&v) & flag)) ? S_OK : S_FALSE;

-    return FALSE;
+    return hr;
+}
+
+static BOOL msaa_check_acc_state(IAccessible *acc, VARIANT cid, ULONG flag)
+{
+    return msaa_check_acc_state_hres(acc, cid, flag) == S_OK;
 }

static HRESULT msaa_acc_get_service(IAccessible *acc, REFGUID sid, REFIID riid, void **service)
@@ -657,23 +663,35 @@ HRESULT WINAPI msaa_provider_GetPropertyValue(IRawElementProviderSimple *iface,
         break;

case UIA_HasKeyboardFocusPropertyId:
-        variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid,
-                    STATE_SYSTEM_FOCUSED));
+        hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_FOCUSED);
+        if (FAILED(hr))
+            return hr;
+
+        variant_init_bool(ret_val, hr == S_OK);
         break;

case UIA_IsKeyboardFocusablePropertyId:
-        variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid,
-                    STATE_SYSTEM_FOCUSABLE));
+        hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_FOCUSABLE);
+        if (FAILED(hr))
+            return hr;
+
+        variant_init_bool(ret_val, hr == S_OK);
         break;

case UIA_IsEnabledPropertyId:
-        variant_init_bool(ret_val, !msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid,
-                    STATE_SYSTEM_UNAVAILABLE));
+        hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_UNAVAILABLE);
+        if (FAILED(hr))
+            return hr;
+
+        variant_init_bool(ret_val, hr == S_FALSE);
         break;

case UIA_IsPasswordPropertyId:
-        variant_init_bool(ret_val, msaa_check_acc_state(msaa_prov->acc, msaa_prov->cid,
-                    STATE_SYSTEM_PROTECTED));
+        hr = msaa_check_acc_state_hres(msaa_prov->acc, msaa_prov->cid, STATE_SYSTEM_PROTECTED);
+        if (FAILED(hr))
+            return hr;
+
+        variant_init_bool(ret_val, hr == S_OK);
         break;

case UIA_NamePropertyId: