Skip to content

Encapsulate registry keys more consistently #18608

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
SaschaCowley merged 15 commits into from
Aug 6, 2025
Merged

Encapsulate registry keys more consistently #18608

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
f0b59ca
Encapsulate registry keys more consistently
seanbudd Aug 4, 2025
c1a1d20
Pre-commit auto-fix
pre-commit-ci[bot] Aug 4, 2025
0c72e46
Add changes
seanbudd Aug 4, 2025
9de0d66
Merge remote-tracking branch 'origin/regKeyRefactor' into regKeyRefactor
seanbudd Aug 4, 2025
8990d02
Pre-commit auto-fix
pre-commit-ci[bot] Aug 4, 2025
d5e93c6
Update user_docs/en/changes.md
seanbudd Aug 4, 2025
306b3cd
fix imports
seanbudd Aug 4, 2025
c7c56d0
Pre-commit auto-fix
pre-commit-ci[bot] Aug 4, 2025
d182d8b
tidy up imports, remove magic constant
seanbudd Aug 4, 2025
923e52b
Pre-commit auto-fix
pre-commit-ci[bot] Aug 4, 2025
5553c69
Update source/installer.py
seanbudd Aug 4, 2025
303eb51
Update source/easeOfAccess.py
seanbudd Aug 4, 2025
7474ddb
Update source/systemUtils.py
seanbudd Aug 4, 2025
627a21e
fix up from review comments
seanbudd Aug 6, 2025
df569bd
fix up nt current version
seanbudd Aug 6, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions source/config/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -158,6 +158,7 @@ class _RegistryKeyX86(str, Enum):
Used to access the 32-bit registry view on x64 systems.
For cleaning up legacy 32-bit NVDA copies.
"""

SOFTWARE = r"SOFTWARE\WOW6432Node"
CURRENT_VERSION = rf"{SOFTWARE}\Microsoft\Windows\CurrentVersion"
INSTALLED_COPY = rf"{CURRENT_VERSION}\Uninstall\NVDA"
Expand Down
9 changes: 7 additions & 2 deletions source/easeOfAccess.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,7 @@ class RegistryKey(str, Enum):
ROOT = _RegistryKey.EASE_OF_ACCESS
TEMP = _RegistryKey.EASE_OF_ACCESS_TEMP
APP = _RegistryKey.EASE_OF_ACCESS_APP

return RegistryKey

if attrName == "ROOT_KEY" and NVDAState._allowDeprecatedAPI():
Expand Down Expand Up @@ -122,15 +123,19 @@ def _getAutoStartConfiguration(autoStartContext: AutoStartContext) -> list[str]:
log.debug(f"Unable to find existing {autoStartContext} {_RegistryKey.EASE_OF_ACCESS}")
return []
except WindowsError:
log.error(f"Unable to open {autoStartContext} {_RegistryKey.EASE_OF_ACCESS} for reading", exc_info=True)
log.error(
f"Unable to open {autoStartContext} {_RegistryKey.EASE_OF_ACCESS} for reading", exc_info=True
)
return []

try:
conf: list[str] = winreg.QueryValueEx(k, "Configuration")[0].split(",")
except FileNotFoundError:
log.debug(f"Unable to find {autoStartContext} {_RegistryKey.EASE_OF_ACCESS} configuration")
except WindowsError:
log.error(f"Unable to query {autoStartContext} {_RegistryKey.EASE_OF_ACCESS} configuration", exc_info=True)
log.error(
f"Unable to query {autoStartContext} {_RegistryKey.EASE_OF_ACCESS} configuration", exc_info=True
)
else:
if not conf[0]:
# "".split(",") returns [""], so remove the empty string.
Expand Down