Merge 3f138b8 into c595463

FelipeZanabria · web-flow · commit 95b6ced44793 · 2024-05-17T06:54:30.000Z
diff --git a/source/JABHandler.py b/source/JABHandler.py
@@ -43,6 +43,9 @@
 import config
 from utils.security import isRunningOnSecureDesktop
 
+#: Verification of the architecture of the running system
+is_64Bit = os.environ["PROCESSOR_ARCHITECTURE"].endswith("64")
+
 #: The path to the user's .accessibility.properties file, used
 #: to enable JAB.
 A11Y_PROPS_PATH = os.path.expanduser(r"~\.accessibility.properties")
@@ -53,7 +56,6 @@
 )
 
 #Some utility functions to help with function defines
-
 def _errcheck(res, func, args):
 	if not res:
 		raise RuntimeError("Result %s" % res)
@@ -81,7 +83,8 @@ def _fixBridgeFunc(restype,name,*argtypes,**kwargs):
 jboolean=c_bool
 
 
-class JOBJECT64(c_int64):
+# If the machine is 64-bit, use c_int64, otherwise use c_int as a parameter.
+class JOBJECT64(c_int64 if is_64Bit else c_int):
 	pass
 AccessibleTable=JOBJECT64
 
@@ -791,7 +794,8 @@ def event_enterJavaWindow(hwnd):
 def enterJavaWindow_helper(hwnd):
 	vmID=c_long()
 	accContext=JOBJECT64()
-	timeout=time.time()+0.2
+	# I changed the timeout to 0.5 because when a Java object disappeared NVDA would hang until I moved focus again.
+	timeout = time.time() + 0.5
 	while time.time()<timeout and not eventHandler.isPendingEvents("gainFocus"):
 		try:
 			bridgeDll.getAccessibleContextWithFocus(hwnd,byref(vmID),byref(accContext))
@@ -836,10 +840,12 @@ def enableBridge():
 
 
 def initialize():
-	global bridgeDll, isRunning
+	global bridgeDll, is_64Bit, isRunning
+	# If the system is 64-bit, load the dll that we have in the NVDA distribution.
+	# Otherwise, it loads the one on the 32-bit system, which does not have the -32 suffix.
+	correctDll = "windowsaccessbridge-32.dll" if is_64Bit else "windowsaccessbridge.dll"
 	try:
-		bridgeDll = cdll.LoadLibrary(
-			os.path.join(NVDAHelper.versionedLibPath, "windowsaccessbridge-32.dll"))
+		bridgeDll = cdll.LoadLibrary(os.path.join(NVDAHelper.versionedLibPath, correctDll))
 	except WindowsError:
 		raise NotImplementedError("dll not available")
 	_fixBridgeFuncs()
diff --git a/user_docs/en/changes.md b/user_docs/en/changes.md
@@ -23,6 +23,7 @@
 * NVDA will announce correctly the autocomplete suggestions in Eclipse and other Eclipse-based environments on Windows 11. (#16416, @thgcode)
 * Improved reliability of automatic text readout, particularly in terminal applications. (#15850, #16027, @Danstiv)
 * NVDA will correctly announce selection changes when editing a cell's text in Microsoft Excel. (#15843)
+* Java Access Bridge support works as expected on 32-bit systems, as it did in version 2019.2.1 and earlier. (#10842, @FelipeZanabria)
 * Windows 11 fixes:
   * NVDA will no longer appear to get stuck when closing the clipboard history and emoji panel. (#16346, #16347, @josephsl)
   * NVDA will announce visible candidates again when opening the Windows 11 IME interface. (#14023, @josephsl)
