Merge 3802381 into 4e3544f

seanbudd · web-flow · commit c889fbb97ae5 · 2024-02-14T03:31:55.000Z
diff --git a/appx/sconscript b/appx/sconscript
@@ -63,7 +63,6 @@ signExec=env['signExec'] if env['certFile'] else None
 # Files from NVDA's distribution that cannot be included in the appx due to policy or security restrictions
 excludedDistFiles=[
 	'nvda_eoaProxy.exe',
-	'nvda_service.exe',
 	'nvda_slave.exe',
 	'nvda_noUIAccess.exe',
 	'lib/IAccessible2Proxy.dll',
@@ -107,4 +106,3 @@ if signExec and not isStoreSubmission:
 	env.AddPostAction(appx,signExec)
 
 Return(['appx'])
-
diff --git a/requirements.txt b/requirements.txt
@@ -12,6 +12,7 @@ requests==2.31.0
 # This can be removed when upgrading py2exe to 0.13+ and python to 3.8+.
 # https://github.com/Ousret/charset_normalizer/issues/253
 charset-normalizer==2.1.1
+psutil==5.9.8
 
 #NVDA_DMP requires diff-match-patch
 diff_match_patch_python==1.0.2
diff --git a/source/buildVersion.py b/source/buildVersion.py
@@ -67,7 +67,7 @@ def formatVersionForGUI(year, major, minor):
 name = "NVDA"
 version_year = 2023
 version_major = 3
-version_minor = 3
+version_minor = 4
 version_build = 0  # Should not be set manually. Set in 'sconscript' provided by 'appVeyor.yml'
 version=_formatDevVersionString()
 publisher="unknown"
diff --git a/source/installer.py b/source/installer.py
@@ -2,12 +2,13 @@
 # A part of NonVisual Desktop Access (NVDA)
 # This file is covered by the GNU General Public License.
 # See the file COPYING for more details.
-# Copyright (C) 2011-2023 NV Access Limited, Joseph Lee, Babbage B.V., Łukasz Golonka
+# Copyright (C) 2011-2024 NV Access Limited, Joseph Lee, Babbage B.V., Łukasz Golonka
 
 import ctypes
 import winreg
 import time
 import os
+import psutil
 import tempfile
 import shutil
 import itertools
@@ -22,7 +23,6 @@
 import COMRegistrationFixes
 import winKernel
 from typing import (
-	Any,
 	Dict,
 	Union,
 )
@@ -205,6 +205,7 @@ def removeOldProgramFiles(destPath):
 		for fn in files:
 			fn = os.path.join(root, fn)
 			# No need to use tryRemoveFile here because these files should never be locked.
+			# TODO: should we use tryRemoveFile anyway here?
 			if os.path.isdir(fn):
 				shutil.rmtree(fn)
 			else:
@@ -566,7 +567,13 @@ def _deleteKeyAndSubkeys(key, subkey):
 class RetriableFailure(Exception):
 	pass
 
-def tryRemoveFile(path,numRetries=6,retryInterval=0.5,rebootOK=False):
+
+def tryRemoveFile(
+		path: str,
+		numRetries: int = 6,
+		retryInterval: float = 0.5,
+		rebootOK: bool = False
+):
 	dirPath=os.path.dirname(path)
 	tempPath=tempfile.mktemp(dir=dirPath)
 	try:
@@ -581,7 +588,7 @@ def tryRemoveFile(path,numRetries=6,retryInterval=0.5,rebootOK=False):
 				os.remove(tempPath)
 			return
 		except OSError:
-			pass
+			log.debugWarning(f"Failed to delete file {tempPath}, attempt {count}/{numRetries}", exc_info=True)
 		time.sleep(retryInterval)
 	if rebootOK:
 		log.debugWarning("Failed to delete file %s, marking for delete on reboot"%tempPath)
@@ -592,12 +599,13 @@ def tryRemoveFile(path,numRetries=6,retryInterval=0.5,rebootOK=False):
 			# #9847: Move file to None to delete it.
 			winKernel.moveFileEx(pathQualifier+tempPath,None,winKernel.MOVEFILE_DELAY_UNTIL_REBOOT)
 		except WindowsError:
-			log.debugWarning("Failed to delete file %s, marking for delete on reboot"%tempPath, exc_info=True)
-		return
+			log.debugWarning(f"Failed to mark file {tempPath} for delete on reboot", exc_info=True)
+		else:
+			return
 	try:
 		os.rename(tempPath,path)
-	except:
-		log.error("Unable to rename back to %s before retriable failier"%path)
+	except Exception:
+		log.exception(f"Unable to rename back to {path} before retriable failure")
 	raise RetriableFailure("File %s could not be removed"%path)
 
 def tryCopyFile(sourceFilePath,destFilePath):
@@ -621,9 +629,27 @@ def tryCopyFile(sourceFilePath,destFilePath):
 			errorCode = ctypes.GetLastError()
 			raise OSError("Unable to copy file %s to %s, error %d"%(sourceFilePath,destFilePath,errorCode))
 
+_nvdaExes = {
+	"nvda.exe",
+	"nvda_noUIAccess.exe",
+	"nvda_uiAccess.exe",
+	"nvda_dmp.exe",
+	"nvda_slave.exe"
+}
+
+
+def _isNVDAAlive(installDir: str) -> bool:
+	fullPathNvdaExes = {os.path.join(installDir, fn) for fn in _nvdaExes}
+	for process in psutil.process_iter():
+		if process.exe() in fullPathNvdaExes:
+			return True
+	return False
+
 
 def install(shouldCreateDesktopShortcut: bool = True, shouldRunAtLogon: bool = True):
 	prevInstallPath=getInstallPath(noDefault=True)
+	if _isNVDAAlive(prevInstallPath):
+		raise RetriableFailure("Cannot install NVDA while it is still running")
 	unregisterInstallation(keepDesktopShortcut=shouldCreateDesktopShortcut)
 	installDir=defaultInstallPath
 	startMenuFolder=defaultStartMenuFolder
@@ -633,7 +659,10 @@ def install(shouldCreateDesktopShortcut: bool = True, shouldRunAtLogon: bool = T
 	# so we shouldn't proceed.
 	# 2. The appropriate executable for nvda.exe will be determined by
 	# which executables exist after copying program files.
-	for f in ("nvda.exe","nvda_noUIAccess.exe","nvda_UIAccess.exe","nvda_service.exe","nvda_slave.exe"):
+	# Some exes are no longer used, but we remove them anyway from legacy copies.
+	# nvda_service.exe was removed in 2017.4 (#7625).
+	# nvda_eoaProxy.exe was removed in 2024.1 (#15544).
+	for f in _nvdaExes.union({"nvda_service.exe", "nvda_eoaProxy.exe"}):
 		f=os.path.join(installDir,f)
 		if os.path.isfile(f):
 			tryRemoveFile(f)
diff --git a/user_docs/en/changes.t2t b/user_docs/en/changes.t2t
@@ -4,6 +4,13 @@ What's New in NVDA
 %!includeconf: ../changes.t2tconf
 %!includeconf: ./locale.t2tconf
 
+= 2023.3.4 =
+This is a patch release to fix an installer issue.
+
+== Bug Fixes ==
+- Fixes bug which caused NVDA installation to fail to an unrecoverable state. (#16122)
+-
+
 = 2023.3.3 =
 This is a patch release to fix a security issue.
 Please responsibly disclose security issues following NVDA's [security policy https://github.com/nvaccess/nvda/blob/master/security.md].
