Merge 0077aec into 833bc4e

jcsteh · web-flow · commit b5fd9013efe2 · 2019-11-20T13:50:02.000+10:00
diff --git a/.gitmodules b/.gitmodules
@@ -40,3 +40,6 @@
 [submodule "include/py2exe"]
 	path = include/py2exe
 	url = https://github.com/nvaccess/py2exe-bin
+[submodule "include/javaAccessBridge32"]
+	path = include/javaAccessBridge32
+	url = https://github.com/nvaccess/javaAccessBridge32-bin.git
diff --git a/include/javaAccessBridge32 b/include/javaAccessBridge32
@@ -0,0 +1 @@
+Subproject commit 130e7b0b2f929ddf0710cd8785a7f1f2c7b9566c
diff --git a/readme.md b/readme.md
@@ -77,6 +77,7 @@ For reference, the following run time dependencies are included in Git submodule
 * lilli.dll, version 2.1.0.0
 * [pySerial](https://pypi.python.org/pypi/pyserial), version 3.4
 * [Python interface to FTDI driver/chip](http://fluidmotion.dyndns.org/zenphoto/index.php?p=news&title=Python-interface-to-FTDI-driver-chip)
+* Java Access Bridge 32 bit, from Zulu Community OpenJDK build 13.0.1+10Zulu (13.28.11)
 
 Additionally, the following build time dependencies are included in Git submodules:
 
diff --git a/sconstruct b/sconstruct
@@ -198,6 +198,11 @@ envArm64['projectResFile'] = resFile
 
 #Fill sourceDir with anything provided for it by miscDeps
 env.recursiveCopy(sourceDir,Dir('miscdeps/source'))
+# Copy in some other dependencies.
+jabDll = "windowsaccessbridge-32.dll"
+Command(sourceLibDir.File(jabDll),
+	env.Dir("#include/javaAccessBridge32").File(jabDll),
+	Copy("$TARGET", "$SOURCE"))
 
 env.SConscript('source/comInterfaces_sconscript',exports=['env'])
 
diff --git a/source/JABHandler.py b/source/JABHandler.py
@@ -4,6 +4,7 @@
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
 
+import os
 import queue
 from ctypes import (
 	c_short,
@@ -37,6 +38,7 @@
 import NVDAObjects.JAB
 import core
 import textUtils
+import NVDAHelper
 
 #Some utility functions to help with function defines
 
@@ -56,24 +58,15 @@ def _fixBridgeFunc(restype,name,*argtypes,**kwargs):
 	if kwargs.get('errcheck'):
 		func.errcheck=_errcheck
 
-#Load the first available access bridge dll
-legacyAccessBridge=True
-try:
-	bridgeDll=getattr(cdll,'windowsAccessBridge-32')
-	legacyAccessBridge=False
-except WindowsError:
-	try:
-		bridgeDll=cdll.windowsAccessBridge
-	except WindowsError:
-		bridgeDll=None
+bridgeDll = None
 
 #Definitions of access bridge types, structs and prototypes
 
 jchar=c_wchar
 jint=c_int
 jfloat=c_float
 jboolean=c_bool
-class JOBJECT64(c_int if legacyAccessBridge else c_int64):
+class JOBJECT64(c_int64):
 	pass
 AccessibleTable=JOBJECT64
 
@@ -248,8 +241,9 @@ class AccessibleKeyBindings(Structure):
 AccessBridge_PropertyCaretChangeFP=CFUNCTYPE(None,c_long,JOBJECT64,JOBJECT64,c_int,c_int)
 AccessBridge_PropertyActiveDescendentChangeFP=CFUNCTYPE(None,c_long,JOBJECT64,JOBJECT64,JOBJECT64,JOBJECT64)
 
-#Appropriately set the return and argument types of all the access bridge dll functions
-if bridgeDll:
+def _fixBridgeFuncs():
+	"""Appropriately set the return and argument types of all the access bridge dll functions
+	"""
 	_fixBridgeFunc(None,'Windows_run')
 	_fixBridgeFunc(None,'setFocusGainedFP',c_void_p)
 	_fixBridgeFunc(None,'setPropertyNameChangeFP',c_void_p)
@@ -741,9 +735,13 @@ def isJavaWindow(hwnd):
 	return bridgeDll.isJavaWindow(hwnd)
 
 def initialize():
-	global isRunning
-	if not bridgeDll:
+	global bridgeDll, isRunning
+	try:
+		bridgeDll = cdll.LoadLibrary(
+			os.path.join(NVDAHelper.versionedLibPath, "windowsaccessbridge-32.dll"))
+	except WindowsError:
 		raise NotImplementedError("dll not available")
+	_fixBridgeFuncs()
 	bridgeDll.Windows_run()
 	# Accept wm_copydata and any wm_user messages from other processes even if running with higher privileges
 	if not windll.user32.ChangeWindowMessageFilter(winUser.WM_COPYDATA, 1):
@@ -775,9 +773,5 @@ def terminate():
 	bridgeDll.setPropertyCaretChangeFP(None)
 	h=bridgeDll._handle
 	bridgeDll=None
-	if legacyAccessBridge:
-		del cdll.windowsAccessBridge 
-	else:
-		delattr(cdll,'windowsAccessBridge-32')
 	windll.kernel32.FreeLibrary(h)
 	isRunning=False
