Merge 54a7877 into 2325979

Author: SaschaCowley

nvdaHelper/archBuild_sconscript

@@ -3,6 +3,7 @@
 # This file may be used under the terms of the GNU General Public License, version 2 or later.
 # For more details see: https://www.gnu.org/licenses/gpl-2.0.html
 
+import sysconfig
 
 Import(
 	"env",
@@ -13,6 +14,7 @@ Import(
 )
 
 
+
 # some utilities for COM proxies
 def clsidStringToCLSIDDefine(clsidString):
 	"""
@@ -70,7 +72,17 @@ env.AddMethod(COMProxyDllBuilder, "COMProxyDll")
 if not env.get("MSVC_VERSION") or tuple(map(int, env.get("MSVC_VERSION").split("."))) < (14, 2):
 	raise RuntimeError("Visual C++ 14.2 (Visual Studio 2019) or newer not found")
 
+PYTHON_PLATFORM = sysconfig.get_platform()
 TARGET_ARCH = env["TARGET_ARCH"]
+
+
+isNVDACoreArch = (
+	(PYTHON_PLATFORM == "win32" and TARGET_ARCH == "x86")
+	or (PYTHON_PLATFORM == "win-amd64" and TARGET_ARCH == "x86_64")
+	or (PYTHON_PLATFORM == "win-arm64" and TARGET_ARCH == "arm64")
+)
+
+
 debug = env["nvdaHelperDebugFlags"]
 release = env["release"]
 signExec = env["signExec"] if (bool(env["certFile"]) ^ bool(env["apiSigningToken"])) else None
@@ -174,26 +186,26 @@ Export("env")
 
 acrobatAccessRPCStubs = env.SConscript("acrobatAccess_sconscript")
 Export("acrobatAccessRPCStubs")
-if TARGET_ARCH == "x86":
+if isNVDACoreArch:
 	env.Install(sourceTypelibDir, acrobatAccessRPCStubs[0])  # typelib
 
 ia2RPCStubs = env.SConscript("ia2_sconscript")
 Export("ia2RPCStubs")
 if signExec:
 	env.AddPostAction(ia2RPCStubs[0], [signExec])
 env.Install(libInstallDir, ia2RPCStubs[0])  # proxy dll
-if TARGET_ARCH == "x86":
+if isNVDACoreArch:
 	env.Install(sourceTypelibDir, ia2RPCStubs[1])  # typelib
 
 iSimpleDomRPCStubs = env.SConscript("ISimpleDOM_sconscript")
 if signExec:
 	env.AddPostAction(iSimpleDomRPCStubs[0], [signExec])
 env.Install(libInstallDir, iSimpleDomRPCStubs[0])  # proxy dll
-if TARGET_ARCH == "x86":
+if isNVDACoreArch:
 	env.Install(sourceTypelibDir, iSimpleDomRPCStubs[1])  # typelib
 
 mathPlayerRPCStubs = env.SConscript("mathPlayer_sconscript")
-if TARGET_ARCH == "x86":
+if isNVDACoreArch:
 	env.Install(sourceTypelibDir, mathPlayerRPCStubs[0])  # typelib
 
 detoursLib = env.SConscript("detours/sconscript")
@@ -202,7 +214,7 @@ Export("detoursLib")
 apiHookObj = env.Object("apiHook", "common/apiHook.cpp")
 Export("apiHookObj")
 
-if TARGET_ARCH == "x86":
+if isNVDACoreArch:
 	localLib = env.SConscript("local/sconscript")
 	Export("localLib")
 	if signExec:
@@ -231,12 +243,11 @@ if signExec:
 	env.AddPostAction(remoteLib[0], [signExec])
 env.Install(libInstallDir, remoteLib)
 
-if TARGET_ARCH in ("x86_64", "arm64"):
-	remoteLoaderProgram = env.SConscript("remoteLoader/sconscript")
-	if signExec:
-		env.AddPostAction(remoteLoaderProgram, [signExec])
-	env.Install(libInstallDir, remoteLoaderProgram)
+remoteLoaderProgram = env.SConscript("remoteLoader/sconscript")
+if signExec:
+	env.AddPostAction(remoteLoaderProgram, [signExec])
+env.Install(libInstallDir, remoteLoaderProgram)
 
-if TARGET_ARCH == "x86":
+if isNVDACoreArch:
 	thirdPartyEnv.SConscript("espeak/sconscript")
 	thirdPartyEnv.SConscript("liblouis/sconscript")

nvdaHelper/espeak/sconscript

@@ -3,6 +3,7 @@
 # See the file COPYING for more details.
 # Copyright (C) 2011-2025 NV Access Limited
 
+import ctypes.wintypes
 import enum
 import typing
 import os
@@ -22,10 +23,12 @@ Import(
 	]
 )
 
+freeLibrary = ctypes.windll.kernel32.FreeLibrary
+freeLibrary.argtypes = (ctypes.wintypes.HANDLE,)
 
 class AutoFreeCDLL(ctypes.CDLL):
 	def __del__(self):
-		ctypes.windll.kernel32.FreeLibrary(self._handle)
+		freeLibrary(self._handle)
 
 
 synthDriversDir = sourceDir.Dir("synthDrivers")

nvdaHelper/liblouis/sconscript

@@ -67,6 +67,10 @@ env.Append(M4FLAGS="-G")
 if "analyze" in env["nvdaHelperDebugFlags"]:
 	env.Append(CCFLAGS="/analyze-")
 
+if env["TARGET_ARCH"] in ("x86_64", "arm64"):
+	# We need to build as 64-bit
+	env.Append(CCFLAGS="-m64")
+
 env.Append(
 	CPPDEFINES=[
 		# The Visual C++ C Runtime deprecates standard POSIX APIs that conflict with

nvdaHelper/local/nvdaHelperLocal.def

@@ -69,6 +69,7 @@ EXPORTS
 	audioDucking_shouldDelay
 	logMessage
 	getOleClipboardText
+	getOleUserType
 	_nvdaControllerInternal_reportLiveRegion
 	_nvdaControllerInternal_openConfigDirectory
 	rateLimitedUIAEventHandler_create

nvdaHelper/local/oleUtils.cpp

@@ -14,6 +14,7 @@ This license can be found at:
 
 #include <windows.h>
 #include <wtypes.h>
+#include <atlcomcli.h>
 #include <common/log.h>
 
 /*
@@ -22,10 +23,19 @@ This license can be found at:
  * @param text a pointer to a BSTR which will hold the resulting text
  * @return S_OK on success or an OLE error code.
  */
-HRESULT getOleClipboardText(IDataObject* dataObject, BSTR* text) {
+HRESULT getOleClipboardText(IUnknown* pUnknown, BSTR* text) {
+	if (!pUnknown) {
+		LOG_DEBUGWARNING(L"pUnknown is null.");
+		return E_INVALIDARG;
+	}
+	CComQIPtr<IDataObject> pDataObject(pUnknown);
+	if (!pDataObject) {
+		LOG_DEBUGWARNING(L"Could not get IDataObject interface from pUnknown");
+		return E_NOINTERFACE;
+	}
 	FORMATETC format={CF_UNICODETEXT,nullptr,DVASPECT_CONTENT,-1,TYMED_HGLOBAL};
 	STGMEDIUM  medium={0};
-	HRESULT res=dataObject->GetData(&format,&medium);
+	HRESULT res=pDataObject->GetData(&format,&medium);
 	if(FAILED(res)) {
 		LOG_DEBUGWARNING(L"IDataObject::getData failed with error "<<res);
 		return res;
@@ -42,3 +52,38 @@ HRESULT getOleClipboardText(IDataObject* dataObject, BSTR* text) {
 	ReleaseStgMedium(&medium);
 	return res;
 }
+
+HRESULT getOleUserType(IUnknown* pUnknown, DWORD dwFlags, BSTR* userType) {
+	if (!pUnknown) {
+		LOG_DEBUGWARNING(L"pUnknown is null.");
+		return E_INVALIDARG;
+	}
+	if(!userType) {
+		LOG_DEBUGWARNING(L"userType is null.");
+		return E_INVALIDARG;
+	}
+	CComQIPtr<IOleObject> pOleObject(pUnknown);
+	if (!pOleObject) {
+		LOG_DEBUGWARNING(L"Could not get IOleObject interface from pUnknown");
+		return E_NOINTERFACE;
+	}
+	LPOLESTR pOleStr{nullptr};
+	HRESULT res = pOleObject->GetUserType(dwFlags, &pOleStr);
+	if (FAILED(res)) {
+		LOG_DEBUGWARNING(L"IOleObject::GetUserType failed with error " << res
+			<< L" for flags " << dwFlags);
+		return res;
+	}
+	if (!pOleStr) {
+		LOG_DEBUGWARNING(L"IOleObject::GetUserType returned null string for flags " << dwFlags);
+		return E_FAIL;
+	}
+	*userType = SysAllocString(pOleStr);
+	CComPtr<IMalloc> pMalloc;
+	if (SUCCEEDED(CoGetMalloc(MEMCTX_TASK, &pMalloc)) && pMalloc) {
+		pMalloc->Free(pOleStr);
+	} else {
+		LOG_ERROR(L"Failed to get IMalloc interface to free memory for pOleStr");
+	}
+	return S_OK;
+}

nvdaHelper/local/wasapi.cpp

@@ -361,7 +361,7 @@ HRESULT WasapiPlayer::feed(unsigned char* data, unsigned int size,
 		} else {
 			// Silence ends in this chunk. Skip the silence and continue.
 			data += silenceSize;
-			size -= silenceSize;
+			size -= (unsigned int)silenceSize;
 			remainingFrames = size / format.nBlockAlign;
 			isTrimmingLeadingSilence = false;  // Stop checking for silence
 
@@ -780,12 +780,12 @@ void SilencePlayer::generateWhiteNoise(float volume) {
 	if (volume == 0) {
 		return;
 	}
-	UINT32 n = whiteNoiseData.size();
+	size_t n = whiteNoiseData.size();
 	const double mean = 0.0;
 	const double stddev = volume * 256;
 	std::default_random_engine generator;
 	std::normal_distribution<double> dist(mean, stddev);
-	for (UINT32 i = 0; i < n; i++) {
+	for (size_t i = 0; i < n; i++) {
 		whiteNoiseData[i] = (INT16)dist(generator);
 	}
 }

projectDocs/dev/buildingNVDA.md

@@ -114,3 +114,22 @@ scons launcher version=test1
 ```
 
 For more see the [sconstruct file](../../sconstruct).
+
+## Creating experimental 64-bit builds
+
+To use NVDA's experimental 64-bit support, instruct UV to use a 64-bit version of python.
+
+```ps
+$env:UV_PYTHON="cpython-3.11.9-windows-x86_64-none"
+```
+
+or
+
+```cmd
+set UV_PYTHON=cpython-3.11.9-windows-x86_64-none
+```
+
+* This will apply to all projects managed by UV.
+* This will not persist across terminal sessions.
+
+If you're using Visual Studio Code as your IDE, our [workspace configuration](https://github.com/nvaccess/vscode-nvda/) includes [terminal profiles](https://code.visualstudio.com/docs/terminal/profiles) to set these environment variables for you in PowerShell or Command Prompt.

sconstruct

@@ -7,6 +7,7 @@
 
 import multiprocessing
 import os
+import platform
 import sys
 from pathlib import Path
 
@@ -104,6 +105,20 @@ vars.Add(
 		allowed_values=[str(x) for x in range(60)],
 	)
 )
+vars.Add(
+	EnumVariable(
+		'targetArch',
+		help="Target architecture of the build output",
+		default='x86',
+		allowed_values=('x86', 'x86_64'),
+		map={
+			'32bit': 'x86',
+			'64bit': 'x86_64',
+			'x64': 'x86_64',
+		},
+		ignorecase=2  # Always downcase,
+	)
+)
 
 # Base environment for this and sub sconscripts
 env = Environment(
@@ -118,6 +133,7 @@ env = Environment(
 	],
 )
 
+
 # speed up subsequent runs by checking timestamps of targets and dependencies, and only using md5 if timestamps differ.
 env.Decider("MD5-timestamp")
 
@@ -172,13 +188,13 @@ sourceDir = env.Dir("source")
 Export("sourceDir")
 clientDir = Dir("extras/controllerClient")
 Export("clientDir")
-sourceLibDir = sourceDir.Dir("lib")
+sourceLibDir = sourceDir.Dir("lib/x86")
 Export("sourceLibDir")
 sourceTypelibDir = sourceDir.Dir("typelibs")
 Export("sourceTypelibDir")
-sourceLibDir64 = sourceDir.Dir("lib64")
+sourceLibDir64 = sourceDir.Dir("lib/x64")
 Export("sourceLibDir64")
-sourceLibDirArm64 = sourceDir.Dir("libArm64")
+sourceLibDirArm64 = sourceDir.Dir("lib/arm64")
 Export("sourceLibDirArm64")
 buildDir = Dir("build")
 outFilePrefix = "nvda{type}_{version}".format(type="" if release else "_snapshot", version=version)
@@ -236,7 +252,10 @@ env32["STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME"] = 1
 env64["STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME"] = 1
 envArm64["STATIC_AND_SHARED_OBJECTS_ARE_THE_SAME"] = 1
 
-env = env32
+if platform.architecture()[0].startswith("64"):
+	env = env64
+else:
+	env = env32
 
 projectRCSubstDict = {
 	"%version_year%": env["version_year"],

source/JABHandler.py

@@ -1137,7 +1137,7 @@ def initialize():
 	global bridgeDll, isRunning
 	try:
 		bridgeDll = cdll.LoadLibrary(
-			os.path.join(NVDAHelper.versionedLibPath, "windowsaccessbridge-32.dll"),
+			os.path.join(NVDAHelper.versionedLibX86Path, "windowsaccessbridge-32.dll"),
 		)
 	except WindowsError:
 		raise NotImplementedError("dll not available")