1 files changed, 162 insertions, 13 deletions
diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.cpp
index 1d110a637e..37148c655a 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiaselectionprovider.cpp
@@ -41,12 +41,24 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionProvider::GetSelection(SAFEARRAY *
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    // First put selected items in a list, then build a safe array with the right size.
+    // First get/create list of selected items, then build a safe array with the right size.
     QList<QAccessibleInterface *> selectedList;
-    for (int i = 0; i < accessible->childCount(); ++i) {
-        if (QAccessibleInterface *child = accessible->child(i)) {
-            if (child->state().selected) {
-                selectedList.append(child);
+    if (QAccessibleSelectionInterface *selectionInterface = accessible->selectionInterface()) {
+        selectedList = selectionInterface->selectedItems();
+    } else {
+        const int childCount = accessible->childCount();
+        selectedList.reserve(childCount);
+        for (int i = 0; i < childCount; ++i) {
+            if (QAccessibleInterface *child = accessible->child(i)) {
+                if (accessible->role() == QAccessible::PageTabList) {
+                    if (child->role() == QAccessible::PageTab && child->state().focused) {
+                        selectedList.append(child);
+                    }
+                } else {
+                    if (child->state().selected) {
+                        selectedList.append(child);
+                    }
+                }
             }
         }
     }
@@ -90,18 +102,155 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionProvider::get_IsSelectionRequired(
     if (!accessible)
         return UIA_E_ELEMENTNOTAVAILABLE;
 
-    // Initially returns false if none are selected. After the first selection, it may be required.
-    bool anySelected = false;
-    for (int i = 0; i < accessible->childCount(); ++i) {
-        if (QAccessibleInterface *child = accessible->child(i)) {
-            if (child->state().selected) {
-                anySelected = true;
-                break;
+    if (accessible->role() == QAccessible::PageTabList) {
+        *pRetVal = TRUE;
+    } else {
+
+        // Initially returns false if none are selected. After the first selection, it may be required.
+        bool anySelected = false;
+        if (QAccessibleSelectionInterface *selectionInterface = accessible->selectionInterface()) {
+            anySelected = selectionInterface->selectedItem(0) != nullptr;
+        } else {
+            for (int i = 0; i < accessible->childCount(); ++i) {
+                if (QAccessibleInterface *child = accessible->child(i)) {
+                    if (child->state().selected) {
+                        anySelected = true;
+                        break;
+                    }
+                }
+            }
+        }
+
+        *pRetVal = anySelected && !accessible->state().multiSelectable && !accessible->state().extSelectable;
+    }
+    return S_OK;
+}
+
+HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionProvider::get_FirstSelectedItem(__RPC__deref_out_opt IRawElementProviderSimple **pRetVal)
+{
+    qCDebug(lcQpaUiAutomation) << __FUNCTION__;
+
+    if (!pRetVal)
+        return E_INVALIDARG;
+    *pRetVal = nullptr;
+
+    QAccessibleInterface *accessible = accessibleInterface();
+    if (!accessible)
+        return UIA_E_ELEMENTNOTAVAILABLE;
+
+    QAccessibleInterface *firstSelectedChild = nullptr;
+    if (QAccessibleSelectionInterface *selectionInterface = accessible->selectionInterface()) {
+        firstSelectedChild = selectionInterface->selectedItem(0);
+        if (!firstSelectedChild)
+            return UIA_E_ELEMENTNOTAVAILABLE;
+    } else {
+        int i = 0;
+        while (!firstSelectedChild && i < accessible->childCount()) {
+            if (QAccessibleInterface *child = accessible->child(i)) {
+                if (accessible->role() == QAccessible::PageTabList) {
+                    if (child->role() == QAccessible::PageTab && child->state().focused)
+                        firstSelectedChild = child;
+                } else if (child->state().selected) {
+                    firstSelectedChild = child;
+                }
+            }
+            i++;
+        }
+    }
+
+    if (!firstSelectedChild)
+        return UIA_E_ELEMENTNOTAVAILABLE;
+
+    if (QWindowsUiaMainProvider *childProvider = QWindowsUiaMainProvider::providerForAccessible(firstSelectedChild))
+    {
+        *pRetVal = static_cast<IRawElementProviderSimple *>(childProvider);
+        return S_OK;
+    }
+
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionProvider::get_LastSelectedItem(__RPC__deref_out_opt IRawElementProviderSimple **pRetVal)
+{
+    qCDebug(lcQpaUiAutomation) << __FUNCTION__;
+
+    if (!pRetVal)
+        return E_INVALIDARG;
+    *pRetVal = nullptr;
+
+    QAccessibleInterface *accessible = accessibleInterface();
+    if (!accessible)
+        return UIA_E_ELEMENTNOTAVAILABLE;
+
+    QAccessibleInterface *lastSelectedChild = nullptr;
+    if (QAccessibleSelectionInterface *selectionInterface = accessible->selectionInterface()) {
+        const int selectedItemCount = selectionInterface->selectedItemCount();
+        if (selectedItemCount <= 0)
+            return UIA_E_ELEMENTNOTAVAILABLE;
+        lastSelectedChild = selectionInterface->selectedItem(selectedItemCount - 1);
+    } else {
+        int i = accessible->childCount() - 1;
+        while (!lastSelectedChild && i >= 0) {
+            if (QAccessibleInterface *child = accessible->child(i)) {
+                if (accessible->role() == QAccessible::PageTabList) {
+                    if (child->role() == QAccessible::PageTab && child->state().focused)
+                        lastSelectedChild = child;
+                } else if (child->state().selected) {
+                    lastSelectedChild = child;
+                }
+            }
+            i--;
+        }
+    }
+
+    if (!lastSelectedChild)
+        return UIA_E_ELEMENTNOTAVAILABLE;
+
+    if (QWindowsUiaMainProvider *childProvider = QWindowsUiaMainProvider::providerForAccessible(lastSelectedChild))
+    {
+        *pRetVal = static_cast<IRawElementProviderSimple *>(childProvider);
+        return S_OK;
+    }
+
+    return S_FALSE;
+}
+
+HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionProvider::get_CurrentSelectedItem(__RPC__deref_out_opt IRawElementProviderSimple **pRetVal)
+{
+    qCDebug(lcQpaUiAutomation) << __FUNCTION__;
+    return get_FirstSelectedItem(pRetVal);
+}
+
+HRESULT STDMETHODCALLTYPE QWindowsUiaSelectionProvider::get_ItemCount(__RPC__out int *pRetVal)
+{
+    qCDebug(lcQpaUiAutomation) << __FUNCTION__;
+
+    if (!pRetVal)
+        return E_INVALIDARG;
+    *pRetVal = -1;
+
+    QAccessibleInterface *accessible = accessibleInterface();
+    if (!accessible)
+        return UIA_E_ELEMENTNOTAVAILABLE;
+
+
+    if (QAccessibleSelectionInterface *selectionInterface = accessible->selectionInterface())
+        *pRetVal = selectionInterface->selectedItemCount();
+    else {
+        int selectedCount = 0;
+        for (int i = 0; i < accessible->childCount(); i++) {
+            if (QAccessibleInterface *child = accessible->child(i)) {
+                if (accessible->role() == QAccessible::PageTabList) {
+                    if (child->role() == QAccessible::PageTab && child->state().focused)
+                        selectedCount++;
+                } else if (child->state().selected) {
+                    selectedCount++;
+                }
             }
         }
+        *pRetVal = selectedCount;
     }
 
-    *pRetVal = anySelected && !accessible->state().multiSelectable && !accessible->state().extSelectable;
     return S_OK;
 }