Merge dc89b90 into 3ac42fe

LeonarddeR · web-flow · commit 2b0cf614bf82 · 2023-10-30T18:18:13.000+01:00
diff --git a/extras/controllerClient/x86/example_csharp.cs b/extras/controllerClient/x86/example_csharp.cs
@@ -13,16 +13,16 @@ namespace NVAccess
 	/// </summary>
 	static class NVDA
 	{
-		[DllImport("nvdaControllerClient32.dll", CharSet = CharSet.Unicode)]
+		[DllImport("nvdaControllerClient.dll", CharSet = CharSet.Unicode)]
 		private static extern int nvdaController_brailleMessage(string message);
 
-		[DllImport("nvdaControllerClient32.dll")]
+		[DllImport("nvdaControllerClient.dll")]
 		private static extern int nvdaController_cancelSpeech();
 
-		[DllImport("nvdaControllerClient32.dll", CharSet = CharSet.Unicode)]
+		[DllImport("nvdaControllerClient.dll", CharSet = CharSet.Unicode)]
 		private static extern int nvdaController_speakText(string text);
 
-		[DllImport("nvdaControllerClient32.dll")]
+		[DllImport("nvdaControllerClient.dll")]
 		private static extern int nvdaController_testIfRunning();
 
 		/// <summary>
diff --git a/extras/controllerClient/x86/example_python.py b/extras/controllerClient/x86/example_python.py
@@ -2,7 +2,7 @@
 import ctypes
 
 #Load the NVDA client library
-clientLib=ctypes.windll.LoadLibrary('./nvdaControllerClient32.dll')
+clientLib=ctypes.windll.LoadLibrary('./nvdaControllerClient.dll')
 
 #Test if NVDA is running, and if its not show a message
 res=clientLib.nvdaController_testIfRunning()
diff --git a/nvdaHelper/client/sconscript b/nvdaHelper/client/sconscript
@@ -28,7 +28,7 @@ controllerRPCHeader,controllerRPCClientSource=env.MSRPCStubs(
 	MSRPCStubs_prefix="nvdaController_",
 )
 
-clientLibName="nvdaControllerClient%s"%('64' if env['TARGET_ARCH']=='x86_64' else '32')
+clientLibName = "nvdaControllerClient"
 
 clientLib=env.SharedLibrary(
 	target=clientLibName,
@@ -45,10 +45,4 @@ clientLib=env.SharedLibrary(
 	],
 )
 
-#if 'install' in COMMAND_LINE_TARGETS:
-#	installDir=env.Install('#../../extras/controllerClient/',clientLib)
-#	env.Default(installDir)
-
-#env.Default(clientLib)
-
 Return(['clientLib','controllerRPCHeader'])
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -56,6 +56,7 @@ Add-ons will need to be re-tested and have their manifest updated.
 - The ``BrailleDisplayDriver`` base class now has ``numRows`` and ``numCols`` properties to provide information about multi line braille displays.
 Setting ``numCells`` is still supported for single line braille displays and ``numCells`` will return the total number of cells for multi line braille displays. (#15386)
 - Updated BrlAPI for BRLTTY to version 0.8.5, and its corresponding python module to a Python 3.11 compatible build. (#15652, @LeonarddeR)
+- The file names of the NVDA Controller Library no longer contain a suffix denoting the architecture, i.e. ``nvdaControllerClient32/64.dll`` are now called ``nvdaControllerClient.dll``. (#15718, #15717, @LeonarddeR)
 -
 
 === API Breaking Changes ===

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,7 @@ Add-ons will need to be re-tested and have their manifest updated.`
`56`	`56`	- The ``BrailleDisplayDriver`` base class now has ``numRows`` and ``numCols`` properties to provide information about multi line braille displays.
`57`	`57`	Setting ``numCells`` is still supported for single line braille displays and ``numCells`` will return the total number of cells for multi line braille displays. (#15386)
`58`	`58`	`- Updated BrlAPI for BRLTTY to version 0.8.5, and its corresponding python module to a Python 3.11 compatible build. (#15652, @LeonarddeR)`
	`59`	+- The file names of the NVDA Controller Library no longer contain a suffix denoting the architecture, i.e. ``nvdaControllerClient32/64.dll`` are now called ``nvdaControllerClient.dll``. (#15718, #15717, @LeonarddeR)
`59`	`60`	`-`
`60`	`61`
`61`	`62`	`=== API Breaking Changes ===`