1 files changed, 49 insertions, 4 deletions

diff --git a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp
index 4d02036196..a62a33cfe2 100644
--- a/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp
+++ b/src/plugins/platforms/windows/uiautomation/qwindowsuiatextrangeprovider.cpp
@@ -167,6 +167,15 @@ HRESULT STDMETHODCALLTYPE QWindowsUiaTextRangeProvider::GetAttributeValue(TEXTAT
         else
             setVariantI4(CaretPosition_Unknown, pRetVal);
         break;
+    case UIA_StrikethroughStyleAttributeId:
+    {
+        const QString value = valueForIA2Attribute(textInterface, QStringLiteral("text-line-through-type"));
+        if (value.isEmpty())
+            break;
+        const TextDecorationLineStyle uiaLineStyle = uiaLineStyleForIA2LineStyle(value);
+        setVariantI4(uiaLineStyle, pRetVal);
+        break;
+    }
     default:
         break;
     }
@@ -307,14 +316,14 @@ HRESULT QWindowsUiaTextRangeProvider::Move(TextUnit unit, int count, int *pRetVa
 
     int len = textInterface->characterCount();
 
-    if (len < 1)
+    if (len < 1 || count == 0)  // MSDN: "Zero has no effect."
         return S_OK;
 
     if (unit == TextUnit_Character) {
         // Moves the start point, ensuring it lies within the bounds.
-        int start = qBound(0, m_startOffset + count, len - 1);
+        int start = qBound(0, m_startOffset + count, len);
         // If range was initially empty, leaves it as is; otherwise, normalizes it to one char.
-        m_endOffset = (m_endOffset > m_startOffset) ? start + 1 : start;
+        m_endOffset = (m_endOffset > m_startOffset) ? qMin(start + 1, len) : start;
         *pRetVal = start - m_startOffset; // Returns the actually moved distance.
         m_startOffset = start;
     } else {
@@ -385,7 +394,7 @@ HRESULT QWindowsUiaTextRangeProvider::MoveEndpointByUnit(TextPatternRangeEndpoin
 
     if (unit == TextUnit_Character) {
         if (endpoint == TextPatternRangeEndpoint_Start) {
-            int boundedValue = qBound(0, m_startOffset + count, len - 1);
+            int boundedValue = qBound(0, m_startOffset + count, len);
             *pRetVal = boundedValue - m_startOffset;
             m_startOffset = boundedValue;
             m_endOffset = qBound(m_startOffset, m_endOffset, len);
@@ -517,6 +526,42 @@ HRESULT QWindowsUiaTextRangeProvider::unselect()
     return S_OK;
 }
 
+// helper method to retrieve the value of the given IAccessible2 text attribute,
+// or an empty string if not set
+QString QWindowsUiaTextRangeProvider::valueForIA2Attribute(QAccessibleTextInterface *textInterface,
+                                                           const QString &key)
+{
+    Q_ASSERT(textInterface);
+
+    int startOffset;
+    int endOffset;
+    const QString attributes = textInterface->attributes(m_startOffset, &startOffset, &endOffset);
+    // don't report if attributes don't apply for the whole range
+    if (startOffset > m_startOffset || endOffset < m_endOffset)
+        return {};
+
+    for (auto attr : QStringTokenizer{attributes, u';'})
+    {
+        const QList<QStringView> items = attr.split(u':', Qt::SkipEmptyParts, Qt::CaseSensitive);
+        if (items.count() == 2 && items[0] == key)
+            return items[1].toString();
+    }
+
+    return {};
+}
+
+TextDecorationLineStyle QWindowsUiaTextRangeProvider::uiaLineStyleForIA2LineStyle(const QString &ia2LineStyle)
+{
+    if (ia2LineStyle == QStringLiteral("none"))
+        return TextDecorationLineStyle_None;
+    if (ia2LineStyle == QStringLiteral("single"))
+        return TextDecorationLineStyle_Single;
+    if (ia2LineStyle == QStringLiteral("double"))
+        return TextDecorationLineStyle_Double;
+
+    return TextDecorationLineStyle_Other;
+}
+
 QT_END_NAMESPACE
 
 #endif // QT_CONFIG(accessibility)