1 files changed, 43 insertions, 147 deletions

diff --git a/src/plugins/platforms/windows/accessible/iaccessible2.cpp b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
index d5cd9ac6db..d9c3d6ac14 100644
--- a/src/plugins/platforms/windows/accessible/iaccessible2.cpp
+++ b/src/plugins/platforms/windows/accessible/iaccessible2.cpp
@@ -61,40 +61,7 @@ static inline T *coTaskMemAllocArray(int size)
 /**************************************************************\
  *                     AccessibleApplication                  *
  **************************************************************/
-//  IUnknown
-HRESULT STDMETHODCALLTYPE AccessibleApplication::QueryInterface(REFIID id, LPVOID *iface)
-{
-    *iface = 0;
-    if (id == IID_IUnknown) {
-        qCDebug(lcQpaAccessibility) << "AccessibleApplication::QI(): IID_IUnknown";
-        *iface = static_cast<IUnknown *>(this);
-    } else if (id == IID_IAccessibleApplication) {
-        qCDebug(lcQpaAccessibility) << "AccessibleApplication::QI(): IID_IAccessibleApplication";
-        *iface = static_cast<IAccessibleApplication*>(this);
-    }
-
-    if (*iface) {
-        AddRef();
-        return S_OK;
-    }
-    return E_NOINTERFACE;
-}
-
-ULONG STDMETHODCALLTYPE AccessibleApplication::AddRef()
-{
-    return ++m_ref;
-}
 
-ULONG STDMETHODCALLTYPE AccessibleApplication::Release()
-{
-    if (!--m_ref) {
-        delete this;
-        return 0;
-    }
-    return m_ref;
-}
-
-/* IAccessibleApplication */
 HRESULT STDMETHODCALLTYPE AccessibleApplication::get_appName(/* [retval][out] */ BSTR *name)
 {
     const QString appName = QGuiApplication::applicationName();
@@ -127,40 +94,11 @@ HRESULT STDMETHODCALLTYPE AccessibleApplication::get_toolkitVersion(/* [retval][
  **************************************************************/
 AccessibleRelation::AccessibleRelation(const QList<QAccessibleInterface *> &targets,
                     QAccessible::Relation relation)
-    : m_targets(targets), m_relation(relation), m_ref(1)
+    : m_targets(targets), m_relation(relation)
 {
     Q_ASSERT(m_targets.count());
 }
 
-/* IUnknown */
-HRESULT STDMETHODCALLTYPE AccessibleRelation::QueryInterface(REFIID id, LPVOID *iface)
-{
-    *iface = 0;
-    if (id == IID_IUnknown || id == IID_IAccessibleRelation)
-        *iface = static_cast<IUnknown *>(this);
-
-    if (*iface) {
-        AddRef();
-        return S_OK;
-    }
-
-    return E_NOINTERFACE;
-}
-
-ULONG STDMETHODCALLTYPE AccessibleRelation::AddRef()
-{
-    return ++m_ref;
-}
-
-ULONG STDMETHODCALLTYPE AccessibleRelation::Release()
-{
-    if (!--m_ref) {
-        delete this;
-        return 0;
-    }
-    return m_ref;
-}
-
 /* IAccessibleRelation */
 HRESULT STDMETHODCALLTYPE AccessibleRelation::get_relationType(
     /* [retval][out] */ BSTR *relationType)
@@ -237,56 +175,53 @@ HRESULT STDMETHODCALLTYPE AccessibleRelation::get_targets(
  **************************************************************/
 HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::QueryInterface(REFIID id, LPVOID *iface)
 {
+    *iface = nullptr;
     QAccessibleInterface *accessible = accessibleInterface();
     if (!accessible)
         return E_NOINTERFACE;
 
-    HRESULT hr = QWindowsMsaaAccessible::QueryInterface(id, iface);
-    if (!SUCCEEDED(hr)) {
-        if (id == IID_IServiceProvider) {
-            *iface = static_cast<IServiceProvider *>(this);
-        } else if (id == IID_IAccessible2) {
-            *iface = static_cast<IAccessible2 *>(this);
-        } else if (id == IID_IAccessibleAction) {
-            if (accessible->actionInterface())
-                *iface = static_cast<IAccessibleAction *>(this);
-        } else if (id == IID_IAccessibleComponent) {
-            *iface = static_cast<IAccessibleComponent *>(this);
-        } else if (id == IID_IAccessibleEditableText) {
-            if (accessible->editableTextInterface() ||
-                accessible->role() == QAccessible::EditableText)
-            {
-                *iface = static_cast<IAccessibleEditableText *>(this);
-            }
-        } else if (id == IID_IAccessibleHyperlink) {
-            //*iface = static_cast<IAccessibleHyperlink *>(this);
-        } else if (id == IID_IAccessibleHypertext) {
-            //*iface = static_cast<IAccessibleHypertext *>(this);
-        } else if (id == IID_IAccessibleImage) {
-            //*iface = static_cast<IAccessibleImage *>(this);
-        } else if (id == IID_IAccessibleTable) {
-            //*iface = static_cast<IAccessibleTable *>(this); // not supported
-        } else if (id == IID_IAccessibleTable2) {
-            if (accessible->tableInterface())
-                *iface = static_cast<IAccessibleTable2 *>(this);
-        } else if (id == IID_IAccessibleTableCell) {
-            if (accessible->tableCellInterface())
-                *iface = static_cast<IAccessibleTableCell *>(this);
-        } else if (id == IID_IAccessibleText) {
-            if (accessible->textInterface())
-                *iface = static_cast<IAccessibleText *>(this);
-        } else if (id == IID_IAccessibleValue) {
-            if (accessible->valueInterface())
-                *iface = static_cast<IAccessibleValue *>(this);
-        }
-        if (*iface) {
-            AddRef();
-            hr = S_OK;
-        } else {
-            hr = E_NOINTERFACE;
+    if (SUCCEEDED(QWindowsMsaaAccessible::QueryInterface(id, iface))
+        || qWindowsComQueryInterface<IServiceProvider>(this, id, iface)
+        || qWindowsComQueryInterface<IAccessible2>(this, id, iface)
+        || qWindowsComQueryInterface<IAccessibleComponent>(this, id, iface)) {
+        return S_OK;
+    }
+
+    if (id == IID_IAccessibleAction) {
+        if (accessible->actionInterface())
+            *iface = static_cast<IAccessibleAction *>(this);
+    } else if (id == IID_IAccessibleEditableText) {
+        if (accessible->editableTextInterface() ||
+            accessible->role() == QAccessible::EditableText)
+        {
+            *iface = static_cast<IAccessibleEditableText *>(this);
         }
+    } else if (id == IID_IAccessibleHyperlink) {
+        //*iface = static_cast<IAccessibleHyperlink *>(this);
+    } else if (id == IID_IAccessibleHypertext) {
+        //*iface = static_cast<IAccessibleHypertext *>(this);
+    } else if (id == IID_IAccessibleImage) {
+        //*iface = static_cast<IAccessibleImage *>(this);
+    } else if (id == IID_IAccessibleTable) {
+        //*iface = static_cast<IAccessibleTable *>(this); // not supported
+    } else if (id == IID_IAccessibleTable2) {
+        if (accessible->tableInterface())
+            *iface = static_cast<IAccessibleTable2 *>(this);
+    } else if (id == IID_IAccessibleTableCell) {
+        if (accessible->tableCellInterface())
+            *iface = static_cast<IAccessibleTableCell *>(this);
+    } else if (id == IID_IAccessibleText) {
+        if (accessible->textInterface())
+            *iface = static_cast<IAccessibleText *>(this);
+    } else if (id == IID_IAccessibleValue) {
+        if (accessible->valueInterface())
+            *iface = static_cast<IAccessibleValue *>(this);
     }
-    return hr;
+    if (*iface) {
+        AddRef();
+        return S_OK;
+    }
+    return E_NOINTERFACE;
 }
 
 
@@ -1593,7 +1528,7 @@ HRESULT STDMETHODCALLTYPE QWindowsIA2Accessible::QueryService(REFGUID guidServic
         return E_POINTER;
     Q_UNUSED(guidService);
     *iface = 0;
-    qCDebug(lcQpaAccessibility) << "QWindowsIA2Accessible::QS(): " << IIDToString(riid);
+    qCDebug(lcQpaAccessibility) << "QWindowsIA2Accessible::QS(): " << QWindowsAccessibleGuid(riid);
 
 
     if (guidService == IID_IAccessible) {
@@ -1692,45 +1627,6 @@ HRESULT QWindowsIA2Accessible::wrapListOfCells(const QList<QAccessibleInterface*
     return count > 0 ? S_OK : S_FALSE;
 }
 
-#define IF_EQUAL_RETURN_IIDSTRING(id, iid) if (id == iid) return QByteArray(#iid)
-
-QByteArray QWindowsIA2Accessible::IIDToString(REFIID id)
-{
-    QByteArray strGuid = QWindowsMsaaAccessible::IIDToString(id);
-    if (!strGuid.isEmpty())
-        return strGuid;
-
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IUnknown);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IDispatch);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessible);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IOleWindow);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IServiceProvider);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessible2);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleAction);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleApplication);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleComponent);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleEditableText);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleHyperlink);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleHypertext);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleImage);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleRelation);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleTable);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleTable2);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleTableCell);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleText);
-    IF_EQUAL_RETURN_IIDSTRING(id, IID_IAccessibleValue);
-
-    // else...
-#if 0   // Can be useful for debugging, but normally we'd like to reduce the noise a bit...
-    OLECHAR szGuid[39]={0};
-    ::StringFromGUID2(id, szGuid, 39);
-    strGuid.reserve(40);
-    ::WideCharToMultiByte(CP_UTF8, 0, szGuid, 39, strGuid.data(), 39, NULL, NULL);
-    strGuid[38] = '\0';
-#endif
-    return strGuid;
-}
-
 // Q_STATIC_ASSERT(IA2_ROLE_CANVAS == QAccessible::Canvas); // ### Qt 6: make them the same
 Q_STATIC_ASSERT(IA2_ROLE_COLOR_CHOOSER == static_cast<IA2Role>(QAccessible::ColorChooser));
 Q_STATIC_ASSERT(IA2_ROLE_FOOTER == static_cast<IA2Role>(QAccessible::Footer));