[PATCH v3 4/8] oleacc: Add get_accName function for edit client accessible object.

[Connor McAdams]

Signed-off-by: Connor McAdams 
---
 dlls/oleacc/client.c | 92 +++++++++++++++++++++++++++++++++++---------
 1 file changed, 74 insertions(+), 18 deletions(-)

diff --git a/dlls/oleacc/client.c b/dlls/oleacc/client.c
index 2a8c58d79a4..c01f060f3a5 100644
--- a/dlls/oleacc/client.c
+++ b/dlls/oleacc/client.c
@@ -45,8 +45,28 @@ typedef struct {
 struct win_class_vtbl {
     void (*init)(Client*);
     HRESULT (*get_state)(Client*, VARIANT, VARIANT*);
+    HRESULT (*get_name)(Client*, VARIANT, BSTR*);
 };

+static HRESULT acc_client_get_name_str(WCHAR *name, UINT len, BSTR *name_out)
+{
+    UINT i;
+
+    if(!len)
+        return S_FALSE;
+
+    for(i=0; i<len; i++) {
+        if(name[i] == '&') {
+            len--;
+            memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR));
+            break;
+        }
+    }
+
+    *name_out = SysAllocStringLen(name, len);
+    return *name_out ? S_OK : E_OUTOFMEMORY;
+}
+
 static inline Client* impl_from_Client(IAccessible *iface)
 {
     return CONTAINING_RECORD(iface, Client, IAccessible_iface);
@@ -166,32 +186,23 @@ static HRESULT WINAPI Client_get_accChild(IAccessible *iface,
     return E_INVALIDARG;
 }

-static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT varID, BSTR *pszName)
+static HRESULT WINAPI Client_get_accName(IAccessible *iface, VARIANT id, BSTR *name_out)
 {
     Client *This = impl_from_Client(iface);
     WCHAR name[1024];
-    UINT i, len;
+    UINT len;

-    TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&varID), pszName);
+    TRACE("(%p)->(%s %p)\n", This, debugstr_variant(&id), name_out);

-    *pszName = NULL;
-    if(convert_child_id(&varID) != CHILDID_SELF || !IsWindow(This->hwnd))
+    *name_out = NULL;
+    if (This->vtbl && This->vtbl->get_name)
+        return This->vtbl->get_name(This, id, name_out);
+
+    if(convert_child_id(&id) != CHILDID_SELF || !IsWindow(This->hwnd))
         return E_INVALIDARG;

len = SendMessageW(This->hwnd, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name);
-    if(!len)
-        return S_FALSE;
-
-    for(i=0; i<len; i++) {
-        if(name[i] == '&') {
-            len--;
-            memmove(name+i, name+i+1, (len-i)*sizeof(WCHAR));
-            break;
-        }
-    }
-
-    *pszName = SysAllocStringLen(name, len);
-    return *pszName ? S_OK : E_OUTOFMEMORY;
+    return acc_client_get_name_str(name, len, name_out);
 }

static HRESULT WINAPI Client_get_accValue(IAccessible *iface, VARIANT varID, BSTR *pszValue)
@@ -693,9 +704,54 @@ static HRESULT edit_get_state(Client *client, VARIANT id, VARIANT *state)
     return S_OK;
 }

+/*
+ * Edit control objects have their name property defined by the first static
+ * text control preceding them in the order of window creation. If one is not
+ * found, the edit has no name property. In the case of the keyboard shortcut
+ * property, the first preceding visible static text control is used.
+ */
+static HWND acc_edit_find_label(HWND hwnd, BOOL visible)
+{
+    HWND cur;
+
+    for(cur = hwnd; cur; cur = GetWindow(cur, GW_HWNDPREV)) {
+        WCHAR class_name[64];
+
+        if(!RealGetWindowClassW(cur, class_name, ARRAY_SIZE(class_name)))
+            continue;
+
+        if(!wcsicmp(class_name, WC_STATICW)) {
+            if (visible && !(GetWindowLongW(cur, GWL_STYLE) & WS_VISIBLE))
+                continue;
+            else
+                break;
+        }
+    }
+
+    return cur;
+}
+
+static HRESULT edit_get_name(Client *client, VARIANT id, BSTR *name_out)
+{
+    WCHAR name[1024];
+    HWND label;
+    UINT len;
+
+    if(convert_child_id(&id) != CHILDID_SELF || !IsWindow(client->hwnd))
+        return E_INVALIDARG;
+
+    label = acc_edit_find_label(client->hwnd, FALSE);
+    if(!label)
+        return S_FALSE;
+
+    len = SendMessageW(label, WM_GETTEXT, ARRAY_SIZE(name), (LPARAM)name);
+    return acc_client_get_name_str(name, len, name_out);
+}
+
 static const win_class_vtbl edit_vtbl = {
     edit_init,
     edit_get_state,
+    edit_get_name,
 };

static const struct win_class_data classes[] = {