Merge 8fca89a into 442476a

LeonarddeR · web-flow · commit 81578bb0de2b · 2023-08-30T19:50:23.000+02:00
diff --git a/source/NVDAObjects/UIA/sysListView32.py b/source/NVDAObjects/UIA/sysListView32.py
@@ -18,17 +18,19 @@
 
 def findExtraOverlayClasses(obj: NVDAObject, clsList: List[Type[NVDAObject]]) -> None:
 	UIAControlType = obj.UIAElement.cachedControlType
-	if UIAControlType == UIAHandler.UIA.UIA_ListItemControlTypeId:
-		clsList.insert(0, SysListViewItem)
-	elif UIAControlType == UIAHandler.UIA.UIA_ListControlTypeId:
+	if UIAControlType == UIAHandler.UIA.UIA_ListControlTypeId:
 		clsList.insert(0, SysListViewList)
+	elif UIAControlType == UIAHandler.UIA.UIA_ListItemControlTypeId and isinstance(obj.parent, SysListViewList):
+		clsList.insert(0, SysListViewItem)
+		if obj.parent._getUIACacheablePropertyValue(UIAHandler.UIA.UIA_IsTablePatternAvailablePropertyId):
+			clsList.insert(0, RowWithFakeNavigation)
 
 
 class SysListViewList(UIA):
 	...
 
 
-class SysListViewItem(RowWithFakeNavigation, ListItem):
+class SysListViewItem(ListItem):
 
 	def _get_name(self) -> str:
 		parent = self.parent
@@ -55,10 +57,14 @@ def _get_name(self) -> str:
 				)
 				and index > 0
 			):
-				columnHeaderItems = e.getCachedPropertyValueEx(
-					UIAHandler.UIA.UIA_TableItemColumnHeaderItemsPropertyId,
-					True
-				)
+				try:
+					columnHeaderItems = e.getCachedPropertyValueEx(
+						UIAHandler.UIA.UIA_TableItemColumnHeaderItemsPropertyId,
+						False
+					)
+				except COMError:
+					log.debugWarning("Couldn't fetch column header items", exc_info=True)
+					columnHeaderItems = None
 			else:
 				columnHeaderItems = None
 			if columnHeaderItems:
diff --git a/source/appModules/mmc.py b/source/appModules/mmc.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2015-2020 NV Access Limited, David Parduhn, Bill Dengler, Leonard de Ruijter, Łukasz Golonka
+# Copyright (C) 2015-2023 NV Access Limited, David Parduhn, Bill Dengler, Leonard de Ruijter, Łukasz Golonka
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -9,6 +9,9 @@
 import eventHandler
 from NVDAObjects.IAccessible import IAccessible
 from NVDAObjects.behaviors import ToolTip
+import NVDAObjects.window
+import winUser
+
 
 class MMCTable(IAccessible):
 	def _get_focusRedirect(self):
@@ -56,8 +59,21 @@ def chooseNVDAObjectOverlayClasses(self, obj, clsList):
 		if obj.windowClassName == "AfxWnd42u":
 			if obj.role == controlTypes.Role.TABLE:
 				clsList.insert(0, MMCTable)
-			elif obj.role in (controlTypes.Role.TABLECELL,
-			controlTypes.Role.TABLEROWHEADER):
+			elif obj.role in (
+				controlTypes.Role.TABLECELL,
+				controlTypes.Role.TABLEROWHEADER
+			):
 				clsList.insert(0, MMCTableCell)
 		if obj.windowClassName == "tooltips_class32" and obj.name is None:
 			clsList.insert(0, toolTipWithEmptyName)
+
+	def isBadUIAWindow(self, hwnd):
+		windowClassName = winUser.getClassName(hwnd)
+		normalizedClassName = NVDAObjects.window.Window.normalizeWindowClassName(windowClassName)
+		if normalizedClassName in (
+			# #15333: SysListView32 controls in mmc are known to have an incomplete UIA implementation.
+			# Revert back to the MSAA implementation instead.
+			'SysListView32'
+		):
+			return True
+		return False
