Skip to content

Create experimental 64-bit dual builds #18207

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
seanbudd merged 134 commits into from
Aug 26, 2025
Merged

Create experimental 64-bit dual builds #18207

Changes from 1 commit
Commits
Show all changes
134 commits
Select commit Hold shift + click to select a range
06c6cae
Use Python 3.11x64 to build, and update some scons build parts
SaschaCowley Feb 12, 2025
8aebc9f
Fix type being too small on x64
SaschaCowley Feb 16, 2025
92f2750
Update scons scripts to build on x64 (Liblouis currently disabled)
SaschaCowley Feb 17, 2025
b299968
Build Liblouis as 64-bit
SaschaCowley Feb 17, 2025
9bab53e
Explicitly set input type of FreeLibrary to avoid type error when bui…
SaschaCowley Feb 17, 2025
3c70fb3
Add currently unused target architecture variable
SaschaCowley Feb 17, 2025
6be112d
sconstruct: rename lib dirs to be lib/arch which standardises them a …
michaelDCurran Feb 19, 2025
87a2504
nvdaHelper archBuild_sconscript: choose to build the various compoen…
michaelDCurran Feb 19, 2025
7a7c218
nvdahelper.py: Handle executing on both 32 bit and 64 bit Python.
michaelDCurran Feb 20, 2025
26d7cf7
Convert NVDAHelper.py into a package. Create localLib.py which contai…
michaelDCurran Feb 21, 2025
79e857d
wip - initial speech!
michaelDCurran Feb 21, 2025
8fe187a
more wip
michaelDCurran Feb 22, 2025
e0988bf
Fix typo
michaelDCurran Feb 22, 2025
0dda3c7
More wip
michaelDCurran Feb 23, 2025
c9a977e
More wip
michaelDCurran Feb 24, 2025
c0afb07
vbuf_getTextInRange should be called from localLib.
michaelDCurran Mar 2, 2025
9630568
declare calculateCharacterOffsets in nvdaHelper localLib
michaelDCurran Mar 2, 2025
fff847c
helperLocalBindingHandle should be tracked as a real HANDLE object so…
michaelDCurran Mar 2, 2025
aa2d95b
localLib.cancellableSendMessageTimeout: use c_void_p for WPARAM and L…
michaelDCurran Mar 2, 2025
9f16317
Temporarily disable import of oletypes.by. It cannot be used on 64 bi…
michaelDCurran Mar 2, 2025
f20f925
Track virtaulBuffer handle as a real ctypes VBufRemote_buffer_Handle…
michaelDCurran Mar 2, 2025
db74521
localLib: declare calculateWordOffsets
michaelDCurran Mar 2, 2025
eaaaa7b
Made building Liblouis architecture aware
SaschaCowley Mar 3, 2025
c1e38c4
Create winBindings package
SaschaCowley Mar 31, 2025
37e889a
Move GetProcessToken declaration to winBindings.advapi32
SaschaCowley Apr 7, 2025
75431ca
Fix unit tests
SaschaCowley Apr 7, 2025
8d877aa
Move changed declarations out of windowUtils.py
SaschaCowley Apr 7, 2025
821f6f4
Move changed ctypes declarations out of displayModel.py
SaschaCowley Apr 7, 2025
fac6282
Fix new declarations
SaschaCowley May 5, 2025
cecf828
(possibly bad) fix for type incompatibility in silence trimming
SaschaCowley May 5, 2025
137f2ca
Rename _dll to dll and add __all__ in winBindings
SaschaCowley May 5, 2025
29b37d3
Strategy for building 64-bit and 32-bit
SaschaCowley May 5, 2025
cd3e72c
Merge branch 'master' into wip-buildX64
SaschaCowley Jun 1, 2025
357d2ff
Fixed approach
SaschaCowley Jun 2, 2025
196a2f2
Pre-commit auto-fix
pre-commit-ci[bot] Jun 2, 2025
c883497
Select between env32 and env64 based on Python architecture
SaschaCowley Jun 2, 2025
93a96dd
Update source/NVDAObjects/window/edit.py
SaschaCowley Jun 2, 2025
b62fe60
Change structure of imports for more obvious diffs
SaschaCowley Jun 2, 2025
b9ff63c
Merge branch 'wip-buildX64' of https://github.com/nvaccess/nvda into …
SaschaCowley Jun 16, 2025
c3b7ce3
Apply suggestions from code review
SaschaCowley Jun 16, 2025
c5b3431
Merge branch 'wip-buildX64' of https://github.com/nvaccess/nvda into …
SaschaCowley Jun 16, 2025
2f54294
Merge branch 'master' into wip-buildX64
SaschaCowley Jun 16, 2025
92c7c54
Fix lint errors
SaschaCowley Jun 16, 2025
b0da8c2
Deprecate NVDAHelper.versionedLibPath in favour of NVDAHelper.version…
SaschaCowley Jun 16, 2025
fbad9ec
Fix NVDAHelper.generateBeep
SaschaCowley Jun 30, 2025
a420b91
Fixed NVDAHelper.VBuf_GetTextInRange
SaschaCowley Jun 30, 2025
109bbe4
Fix NVDAHelper.onSsmlMarkReached
SaschaCowley Jun 30, 2025
0656f80
Merge branch 'master' into wip-buildX64
SaschaCowley Jun 30, 2025
4b0676b
Move changes to the right section
SaschaCowley Jun 30, 2025
2a767ac
Add note about terminal profiles
SaschaCowley Jun 30, 2025
aac7bba
Fix type hints in excel
SaschaCowley Jun 30, 2025
3a8a582
Update source/UIAHandler/__init__.py
SaschaCowley Jun 30, 2025
6c5c23a
Fix NVDAObjects.window.excel.ExcelCellInfo
SaschaCowley Jun 30, 2025
0e86fc0
Apply suggestions from code review
SaschaCowley Jul 14, 2025
011476e
Add API breaking change note for NVDAHelper.localLib
SaschaCowley Jul 14, 2025
3aac984
Move WAVEFORMATEX to winBindings.mmeapi
SaschaCowley Jul 14, 2025
68cdf42
Add deprecation notice for nvwave.WAVEFORMATEX
SaschaCowley Jul 14, 2025
c8c229f
Merge branch 'master' into wip-buildX64
SaschaCowley Jul 14, 2025
54a7877
Reintroduce support for reporting a label for embedded objects in ric…
michaelDCurran Jul 15, 2025
906fbe1
Merge branch 'master' into wip-buildX64
michaelDCurran Jul 16, 2025
96de458
Fix a ctypes overflow error at end of speech in sapi5, in ISpNotifySi…
michaelDCurran Jul 16, 2025
88f5e45
Pre-commit auto-fix
pre-commit-ci[bot] Jul 16, 2025
a22bb4f
Merge branch 'master' into wip-buildX64
SaschaCowley Jul 21, 2025
ac0cc36
Add notes on ctypes
SaschaCowley Jul 21, 2025
5cd76b5
Mark hwPortUtils.validHandle_errcheck as internal and note removal fr…
SaschaCowley Jul 21, 2025
935f32c
Merge branch 'master' into wip-buildX64
michaelDCurran Jul 27, 2025
5e6ef81
setup.py: correctly copy dlls into the new lib directory structure. T…
michaelDCurran Jul 27, 2025
78d5906
COM registration fixing tool: allow running when either 32 bit or 64…
michaelDCurran Jul 28, 2025
fb1e0d5
Merge branch 'master' into wip-buildX64
SaschaCowley Jul 28, 2025
4dc9ed2
NVDA built as 64 bit will now make use of the 64 bit version of Java …
michaelDCurran Jul 28, 2025
a6c67b6
Pre-commit auto-fix
pre-commit-ci[bot] Jul 28, 2025
02ec69c
Ensure installer code does not incorrectly remove libs when creating …
michaelDCurran Jul 29, 2025
47891b8
It is now possible to fully install and run 64 bit NVDA. But please n…
michaelDCurran Jul 30, 2025
770920a
Switch default python version for 64bit branch (#18594)
seanbudd Jul 30, 2025
21d286e
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Jul 31, 2025
4fb7f25
Pre-commit auto-fix
pre-commit-ci[bot] Jul 31, 2025
cdfb720
Parallelize GitHub actions builds for 32/64 bit (#18596)
seanbudd Aug 4, 2025
102acfc
add definition for freeLibrry to winBindings.kernel32 and use in jabH…
michaelDCurran Aug 4, 2025
4c8ea51
Many more definitions added to winBindings in order to get the Starts…
michaelDCurran Aug 4, 2025
6145200
Pre-commit auto-fix
pre-commit-ci[bot] Aug 4, 2025
09e9311
Add back missing imports
michaelDCurran Aug 4, 2025
e092b14
Pre-commit auto-fix
pre-commit-ci[bot] Aug 4, 2025
1bde1f8
winKernel.openProcess: should still return 0 not raise.
michaelDCurran Aug 4, 2025
6df0994
winuser: make sure that WNDPROC and WNDCLASSEXW are exported
michaelDCurran Aug 4, 2025
0f51d99
Pre-commit auto-fix
pre-commit-ci[bot] Aug 4, 2025
adc4738
re-enable restarts on crash
michaelDCurran Aug 4, 2025
d7e1c8c
setup.py: ensure to copy nvdaHelperRemoteLoader.exe in the lib dirs b…
michaelDCurran Aug 5, 2025
c72db87
nvdaHelper: when cor archetecture is not x86, run the x86 build of nv…
michaelDCurran Aug 5, 2025
1024ee9
Allow copying browse mode content to clipboard to work in 64 bit by p…
michaelDCurran Aug 6, 2025
63150ff
Pre-commit auto-fix
pre-commit-ci[bot] Aug 6, 2025
5561ff8
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 6, 2025
7f8d432
Switch javaAccessBridge submodule to master with 64 bit windowsAccess…
michaelDCurran Aug 6, 2025
130ff59
update copyright headers and linting
seanbudd Aug 6, 2025
348c64c
update copyright headers and other fixes
seanbudd Aug 6, 2025
0dc772b
move PAINTSTRUCT location
seanbudd Aug 6, 2025
a4468ea
Pre-commit auto-fix
pre-commit-ci[bot] Aug 6, 2025
1c5848d
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 6, 2025
9feb012
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 6, 2025
6b956e9
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 6, 2025
aa610ab
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 7, 2025
f8eed9a
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 7, 2025
f25fef1
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 8, 2025
ac5cea0
Pre-commit auto-fix
pre-commit-ci[bot] Aug 8, 2025
55a4670
disable branch builds, only builds PRs
seanbudd Aug 8, 2025
6d853a5
Merge branch 'master' into wip-buildX64
SaschaCowley Aug 12, 2025
81caca8
Merge remote-tracking branch 'origin/master' into wip-buildX64
seanbudd Aug 15, 2025
8668cad
Merge branch 'master' into wip-buildX64
SaschaCowley Aug 18, 2025
c975bc2
Update projectDocs/dev/buildingNVDA.md
seanbudd Aug 18, 2025
518bd66
Apply suggestions from code review
SaschaCowley Aug 18, 2025
49c9fb6
Update projectDocs/dev/buildingNVDA.md
SaschaCowley Aug 18, 2025
24ecfec
Apply suggestions from code review
SaschaCowley Aug 18, 2025
4bd6f3d
Merge branch 'master' into wip-buildX64
SaschaCowley Aug 25, 2025
734f8c3
Merge branch 'master' into wip-buildX64
SaschaCowley Aug 25, 2025
9aa6888
Update source/hwPortUtils.py
SaschaCowley Aug 25, 2025
7251b72
back compat and minor fixes
seanbudd Aug 25, 2025
bec9e1e
automated linting
seanbudd Aug 25, 2025
93be0df
Pre-commit auto-fix
pre-commit-ci[bot] Aug 25, 2025
5e863fe
fix paintrsutrct import
seanbudd Aug 25, 2025
55bfc32
fix imports (ignore)
seanbudd Aug 25, 2025
5a8f8bd
Remove typing.Optional from logHandler
SaschaCowley Aug 25, 2025
30abd35
refactor versionedLibPath
seanbudd Aug 25, 2025
cc88e01
Merge branch 'wip-buildX64' of https://github.com/nvaccess/nvda into …
SaschaCowley Aug 25, 2025
c97bcbe
Fix up copyright years
SaschaCowley Aug 25, 2025
b8b0637
fix up NVDAState
seanbudd Aug 25, 2025
3f20c06
Merge remote-tracking branch 'origin/wip-buildX64' into wip-buildX64
seanbudd Aug 25, 2025
4cdf0df
deprecate coreArchLibPath
seanbudd Aug 25, 2025
e57e5b4
fix lint
seanbudd Aug 25, 2025
8b47f74
fix up aliases
seanbudd Aug 25, 2025
bf06fed
fix docstring
seanbudd Aug 25, 2025
000f182
Fix up change long
SaschaCowley Aug 25, 2025
c599edd
remove unused code
seanbudd Aug 25, 2025
21c629a
rem os.path.join
seanbudd Aug 25, 2025
e78d12e
Partially revert "Fix up change long"
SaschaCowley Aug 25, 2025
6f06511
Merge branch 'master' into wip-buildX64
SaschaCowley Aug 25, 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
Prev Previous commit
Next Next commit
vbuf_getTextInRange should be called from localLib.
  • Loading branch information
@michaelDCurran @SaschaCowley
michaelDCurran authored and SaschaCowley committed May 5, 2025
commit c0afb075a2bcb6d528959bb28603fad8a8a190a5
2 changes: 1 addition & 1 deletion source/virtualBuffers/__init__.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -284,7 +284,7 @@ def _getStoryLength(self):
def _getTextRange(self, start, end):
if start == end:
return ""
return NVDAHelper.VBuf_getTextInRange(self.obj.VBufHandle, start, end, False) or ""
return NVDAHelper.localLib.VBuf_getTextInRange(self.obj.VBufHandle, start, end, False) or ""

def _getPlaceholderAttribute(self, attrs, placeholderAttrsKey):
"""Gets the placeholder attribute to be used.
Expand Down