Skip to content

Commit bc762a0

Browse files
authored
Merge 6a9d1b8 into a9a6e46
2 parents a9a6e46 + 6a9d1b8 commit bc762a0

290 files changed

Lines changed: 15949 additions & 9674 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

.github/CODEOWNERS

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
/projectDocs/community/ @nvaccess/userDocs
5050
/projectDocs/testing/ @nvaccess/userDocs @nvaccess/developers
5151
/projectDocs/issues/ @nvaccess/userDocs @nvaccess/developers
52-
readme.md @nvaccess/userDocs @nvaccess/developers
52+
/readme.md @nvaccess/userDocs @nvaccess/developers
5353
security.md @nvaccess/userDocs @nvaccess/developers
5454
CODE_OF_CONDUCT.md @nvaccess/userDocs @nvaccess/developers
5555
.github/CONTRIBUTING.md @nvaccess/userDocs @nvaccess/developers

.github/PULL_REQUEST_TEMPLATE.md

Lines changed: 6 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -19,12 +19,6 @@ See https://github.com/nvaccess/nvda/blob/master/.github/CONTRIBUTING.md.
1919

2020
### Known issues with pull request:
2121

22-
### Change log entries:
23-
New features
24-
Changes
25-
Bug fixes
26-
For Developers
27-
2822
### Code Review Checklist:
2923

3024
<!--
@@ -38,22 +32,20 @@ A detailed explanation of this checklist is available here:
3832
https://github.com/nvaccess/nvda/blob/master/projectDocs/dev/githubPullRequestTemplateExplanationAndExamples.md#code-review-checklist
3933
-->
4034

41-
- [ ] Pull Request description:
42-
- description is up to date
43-
- change log entries
44-
- [ ] Testing:
45-
- Unit tests
46-
- System (end to end) tests
47-
- Manual testing
48-
- [ ] API is compatible with existing add-ons.
4935
- [ ] Documentation:
36+
- Change log entry
5037
- User Documentation
5138
- Developer / Technical Documentation
5239
- Context sensitive help for GUI changes
40+
- [ ] Testing:
41+
- Unit tests
42+
- System (end to end) tests
43+
- Manual testing
5344
- [ ] UX of all users considered:
5445
- Speech
5546
- Braille
5647
- Low Vision
5748
- Different web browsers
5849
- Localization in other languages / culture than English
50+
- [ ] API is compatible with existing add-ons.
5951
- [ ] Security precautions taken.

.gitignore

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,9 @@
11
*.mo
22
source/comInterfaces/*.py
3+
!source/comInterfaces/__init__.py
4+
# These are manually generated and updated, so don't delete them
5+
!source/comInterfaces/UIAutomationClient.py
6+
!source/comInterfaces/_944DE083_8FB8_45CF_BCB7_C477ACB2F897_0_1_0.py
37
*.log
48
source/userConfig
59
build

.vsconfig

Lines changed: 14 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,14 @@
1+
{
2+
"version": "1.0",
3+
"components": [
4+
"Microsoft.VisualStudio.Workload.NativeDesktop",
5+
"Microsoft.VisualStudio.Component.Windows11SDK.22621",
6+
"Microsoft.VisualStudio.Component.VC.Llvm.ClangToolset",
7+
"Microsoft.VisualStudio.Component.VC.Llvm.Clang",
8+
"Microsoft.VisualStudio.Component.VC.Tools.x86.x64",
9+
"Microsoft.VisualStudio.Component.VC.Tools.ARM64EC",
10+
"Microsoft.VisualStudio.Component.VC.Tools.ARM64",
11+
"Microsoft.VisualStudio.Component.VC.ATL",
12+
"Microsoft.VisualStudio.Component.VC.ATL.ARM64"
13+
]
14+
}

appveyor.yml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
# Many more options available, see docs:
33
# https://www.appveyor.com/docs/appveyor-yml/
44

5-
os: Visual Studio 2019
5+
os: Visual Studio 2022
66
version: "{branch}-{build}"
77

88
branches:
@@ -20,7 +20,7 @@ init:
2020
"INIT, $(Get-Date -Format 'o')"| Out-File ../timing.csv -Append
2121
2222
environment:
23-
PY_PYTHON: 3.7-32
23+
PY_PYTHON: 3.11-32
2424
secure_authenticode_pass:
2525
secure: Way+hJyhbiLG/cmCo4+dHHzS5DiSvk/45o6frnIQ27GBX6nVDsh7jwQ7fSnqxBRP
2626
secure_ssh_pass:

appveyor/scripts/deployScript.ps1

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,6 +27,7 @@ if (!$env:APPVEYOR_PULL_REQUEST_NUMBER -and $env:versionType) {
2727
cat deploy.json | ssh nvaccess@deploy.nvaccess.org nvdaAppveyorHook
2828

2929
# Upload symbols to Mozilla.
30+
py -m pip install --upgrade --no-warn-script-location pip
3031
py -m pip install --no-warn-script-location requests
3132
Try {
3233
py appveyor\mozillaSyms.py

appveyor/scripts/tests/unitTests.ps1

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
$outDir = (Resolve-Path .\testOutput\unit\)
22
$unitTestsXml = "$outDir\unitTests.xml"
3-
.\rununittests.bat --with-xunit --xunit-file="$unitTestsXml"
3+
.\rununittests.bat --output-file "$unitTestsXml"
44
if($LastExitCode -ne 0) {
55
Set-AppveyorBuildVariable "testFailExitCode" $LastExitCode
66
Add-AppveyorMessage "FAIL: Unit tests. See test results for more information."

appx/sconscript

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -61,8 +61,7 @@ else: # not for submission, just side-loadable
6161
signExec=env['signExec'] if env['certFile'] else None
6262

6363
# Files from NVDA's distribution that cannot be included in the appx due to policy or security restrictions
64-
excludedDistFiles=[
65-
'nvda_eoaProxy.exe',
64+
excludedDistFiles = [
6665
'nvda_service.exe',
6766
'nvda_slave.exe',
6867
'nvda_noUIAccess.exe',
@@ -107,4 +106,3 @@ if signExec and not isStoreSubmission:
107106
env.AddPostAction(appx,signExec)
108107

109108
Return(['appx'])
110-
Lines changed: 46 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,46 @@
1+
// Copyright(C) 2006-2023 NV Access Limited, Leonard de Ruijter
2+
// This file is covered by the GNU Lesser General Public License, version 2.1.
3+
// See the file license.txt for more details.
4+
5+
#define UNICODE
6+
#include <windows.h>
7+
#include <stdio.h>
8+
#include "nvdaController.h"
9+
10+
error_status_t __stdcall onMarkReached(const wchar_t* name) {
11+
wprintf(L"Reached SSML mark with name %s\n", name);
12+
return ERROR_SUCCESS;
13+
}
14+
15+
int main(int argc, char *argv[]) {
16+
long res = nvdaController_testIfRunning();
17+
if (res != 0) {
18+
MessageBox(0, L"Error communicating with NVDA", L"Error", 0);
19+
return 1;
20+
}
21+
for (int i = 0; i < 4; i++) {
22+
nvdaController_speakText(L"This is a test speech message");
23+
nvdaController_brailleMessage(L"This is a test braille message");
24+
Sleep(1000);
25+
}
26+
wchar_t* ssml = (
27+
L"<speak>"
28+
L"This is one sentence. "
29+
L"<mark name=\"test\" />"
30+
L"<prosody pitch=\"200%\">This sentence is pronounced with higher pitch.</prosody>"
31+
L"<mark name=\"test2\" />"
32+
L"This is a third sentence. "
33+
L"<mark name=\"test3\" />"
34+
L"This is a fourth sentence. We will stay silent for a second after this one."
35+
L"<break time=\"1000ms\" />"
36+
L"<mark name=\"test4\" />"
37+
L"This is a fifth sentence. "
38+
L"<mark name=\"test5\" />"
39+
L"</speak>"
40+
);
41+
nvdaController_setOnSsmlMarkReachedCallback(&onMarkReached);
42+
nvdaController_speakSsml(ssml, SYMBOL_LEVEL_UNCHANGED, SPEECH_PRIORITY_NORMAL, FALSE);
43+
nvdaController_setOnSsmlMarkReachedCallback(NULL);
44+
nvdaController_brailleMessage(L"Test completed!");
45+
return 0;
46+
}
Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,4 @@
1+
.vs
2+
bin
3+
obj
4+
*.sln

0 commit comments

Comments
 (0)