Merge pull request nvaccess#15545 from nvaccess/beta

Merge beta to master
michaelweghorn · Sep 28, 2023 · fc28c48 · fc28c48
2 parents a57faa1 + 63c2b84
commit fc28c48
Show file tree

Hide file tree

Showing 4 changed files with 9 additions and 5 deletions.
diff --git a/appx/manifest.xml.subst b/appx/manifest.xml.subst
@@ -24,7 +24,7 @@
 		<TargetDeviceFamily 
 			Name="Windows.Desktop" 
 			MinVersion="10.0.18990.0" 
-			MaxVersionTested="10.0.22621.0" 
+			MaxVersionTested="10.0.22631.0" 
 		/>
 	</Dependencies>
 	<Capabilities>

diff --git a/source/UIAHandler/__init__.py b/source/UIAHandler/__init__.py
@@ -86,6 +86,9 @@
 badUIAWindowClassNames = (
 	# UIA events of candidate window interfere with MSAA events.
 	"Microsoft.IME.CandidateWindow.View",
+	# Known issue with "Reliability Monitor" in explorer.exe #15541.
+	# Task manager and mmc.exe are also affected, but have isBadUIAWindow workarounds.
+	"SysListView32",
 	"SysTreeView32",
 	"WuDuiListView",
 	"ComboBox",

diff --git a/source/winVersion.py b/source/winVersion.py
@@ -1,5 +1,5 @@
 # A part of NonVisual Desktop Access (NVDA)
-# Copyright (C) 2006-2022 NV Access Limited, Bill Dengler, Joseph Lee
+# Copyright (C) 2006-2023 NV Access Limited, Bill Dengler, Joseph Lee
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
@@ -10,7 +10,7 @@
 When working on this file, consider moving to winAPI.
 """
 
-from typing import Optional
+from typing import Optional, Dict
 import sys
 import os
 import functools
@@ -21,7 +21,7 @@
 # Records a mapping between Windows builds and release names.
 # These include build 10240 for Windows 10 1507 and releases with multiple release builds.
 # These are applicable to Windows 10 and later as they report the same system version (10.0).
-_BUILDS_TO_RELEASE_NAMES = {
+_BUILDS_TO_RELEASE_NAMES: Dict[int, str] = {
 	10240: "Windows 10 1507",
 	10586: "Windows 10 1511",
 	14393: "Windows 10 1607",
@@ -39,6 +39,7 @@
 	20348: "Windows Server 2022",
 	22000: "Windows 11 21H2",
 	22621: "Windows 11 22H2",
+	22631: "Windows 11 23H2",
 }
 
 
@@ -165,6 +166,7 @@ def __ge__(self, other):
 WINSERVER_2022 = WinVersion(major=10, minor=0, build=20348)
 WIN11 = WIN11_21H2 = WinVersion(major=10, minor=0, build=22000)
 WIN11_22H2 = WinVersion(major=10, minor=0, build=22621)
+WIN11_23H2 = WinVersion(major=10, minor=0, build=22631)
 
 
 @functools.lru_cache(maxsize=1)

diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -134,7 +134,6 @@ There's also been bug fixes for the Add-on Store, Microsoft Office, Microsoft Ed
   - Fixed bug where add-ons cannot be installed if a previous download failed or was cancelled. (#15469)
   - Fixed issues with handling incompatible add-ons when upgrading NVDA. (#15414, #15412, #15437)
   -
-- Fixed support for System List view (``SysListView32``) controls in Windows Forms applications. (#15283)
 - NVDA once again announces calculation results in the Windows 32bit calculator on Server, LTSC and LTSB versions of Windows. (#15230)
 - NVDA no longer ignores focus changes when a nested window (grand child window) gets focus. (#15432)
 - Fixed performance issues with Task Manager and some Windows versions. (#6245)