Skip to content

Commit

Permalink
Update detours, ia2, sonic, w3c, wil (nvaccess#15695)
Browse files Browse the repository at this point in the history
Summary of the issue:
Update various dependences to their latest commit on master.

Description of user facing changes
Should be none

Description of development approach
Updated detours, ia2, sonic, w3c, wil to their latest master commit.

Created a build to test.

Chrome tests were temporarily disabled due to an issue with Chrome on appveyor. This appears to be resolved after several successful builds with tests enabled, so they have been re-enabled.
Chrome tests were updated to support the latest w3c examples.
  • Loading branch information
seanbudd authored Oct 31, 2023
1 parent 8b90ece commit da446b3
Show file tree
Hide file tree
Showing 11 changed files with 93 additions and 25 deletions.
2 changes: 1 addition & 1 deletion .github/CODEOWNERS
Validating CODEOWNERS rules …
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@
/projectDocs/community/ @nvaccess/userDocs
/projectDocs/testing/ @nvaccess/userDocs @nvaccess/developers
/projectDocs/issues/ @nvaccess/userDocs @nvaccess/developers
readme.md @nvaccess/userDocs @nvaccess/developers
/readme.md @nvaccess/userDocs @nvaccess/developers
security.md @nvaccess/userDocs @nvaccess/developers
CODE_OF_CONDUCT.md @nvaccess/userDocs @nvaccess/developers
.github/CONTRIBUTING.md @nvaccess/userDocs @nvaccess/developers
57 changes: 57 additions & 0 deletions include/readme.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,57 @@
## Updating dependencies
Updates should be reflected in the [createDevEnvironment guide](../projectDocs/dev/createDevEnvironment.md) and the [change log](../user_docs/en/changes.t2t).

### Detours
https://github.com/microsoft/Detours

Fetch latest from master.
Test using [the steps here](../projectDocs/design/displayModel.md).
An example control is the file properties dialog from file explorer.

### eSpeak
https://github.com/espeak-ng/espeak-ng

[eSpeak guide](./espeak.md)

### ia2
https://github.com/LinuxA11y/IAccessible2

Fetch latest from master.

### javaAccessBridge32
[javaAccessBridge32-bin readme](https://github.com/nvaccess/javaAccessBridge32-bin)

### liblouis
TODO

### microsoft-ui-uiautomation
https://www.github.com/michaeldcurran/microsoft-ui-uiautomation/

We are stuck on our own fork.
The fork specifically adds support for connection bound objects to the high-level API, see PR microsoft/microsoft-ui-uiautomation#95.

### nsis
[NSIS-build readme](https://github.com/nvaccess/NSIS-build)

### nvda_dmp
TODO

### nvda-cldr
[nvda-cldr readme](https://github.com/nvaccess/nvda-cldr)

### sonic
https://github.com/waywardgeek/sonic

Fetch latest from master.
Used to boost in rate eSpeak.

### w3c-aria-practices
https://github.com/w3c/aria-practices

Fetch latest from master.
Used in chrome system tests.

### wil
https://github.com/microsoft/wil/

Fetch latest from master.
2 changes: 1 addition & 1 deletion include/sonic
Submodule sonic updated 7 files
+3 −0 .gitmodules
+38 −10 Makefile
+13 −0 TODO
+9 −9 sonic.c
+57 −3 sonic.h
+1 −0 speedy
+1 −1 wave.c
2 changes: 1 addition & 1 deletion include/w3c-aria-practices
2 changes: 1 addition & 1 deletion include/wil
Submodule wil updated 72 files
+13 −6 CMakeLists.txt
+54 −13 README.md
+41 −0 SECURITY.md
+54 −52 cmake/common_build_flags.cmake
+177 −157 include/wil/Tracelogging.h
+174 −34 include/wil/com.h
+467 −0 include/wil/com_apartment_variable.h
+33 −13 include/wil/common.h
+810 −0 include/wil/coroutine.h
+102 −21 include/wil/cppwinrt.h
+290 −0 include/wil/cppwinrt_authoring.h
+140 −4 include/wil/cppwinrt_helpers.h
+58 −31 include/wil/filesystem.h
+2 −2 include/wil/nt_result_macros.h
+3,017 −24 include/wil/registry.h
+1,860 −0 include/wil/registry_helpers.h
+187 −122 include/wil/resource.h
+14 −10 include/wil/result.h
+121 −131 include/wil/result_macros.h
+5 −4 include/wil/result_originate.h
+21 −8 include/wil/stl.h
+42 −30 include/wil/token_helpers.h
+245 −22 include/wil/win32_helpers.h
+104 −0 include/wil/win32_result_macros.h
+88 −47 include/wil/winrt.h
+13 −13 include/wil/wistd_config.h
+22 −18 include/wil/wistd_functional.h
+46 −46 include/wil/wistd_memory.h
+4 −4 include/wil/wistd_type_traits.h
+170 −0 natvis/wil.natvis
+2 −0 packaging/nuget/CMakeLists.txt
+1 −0 packaging/nuget/Microsoft.Windows.ImplementationLibrary.nuspec
+3 −0 packaging/nuget/Microsoft.Windows.ImplementationLibrary.targets
+20 −5 scripts/azure-pipelines.yml
+12 −18 scripts/build_all.cmd
+2 −28 scripts/init.cmd
+10 −9 scripts/init_all.cmd
+29 −43 scripts/runtests.cmd
+45 −2 tests/CMakeLists.txt
+401 −0 tests/ComApartmentVariableTests.cpp
+99 −13 tests/ComTests.cpp
+1 −1 tests/CommonTests.cpp
+2 −0 tests/CppWinRT20Tests.cpp
+277 −0 tests/CppWinRTAuthoringTests.cpp
+375 −2 tests/CppWinRTTests.cpp
+6 −6 tests/FakeWinRTTypes.h
+24 −1 tests/FileSystemTests.cpp
+5,197 −0 tests/RegistryTests.cpp
+47 −2 tests/ResourceTests.cpp
+51 −2 tests/ResultTests.cpp
+2 −2 tests/Rpc.cpp
+137 −0 tests/StlTests.cpp
+5 −5 tests/TokenHelpersTests.cpp
+4 −0 tests/TraceLoggingTests.cpp
+395 −0 tests/TraceLoggingTests.h
+10 −0 tests/TraceLoggingTests_PartB.cpp
+1 −1 tests/WatcherTests.cpp
+94 −6 tests/WinRTTests.cpp
+4 −4 tests/WinVerifyTrustTest.cpp
+4 −3 tests/app/CMakeLists.txt
+4,564 −1,522 tests/catch.hpp
+18 −0 tests/common.h
+15 −9 tests/cpplatest/CMakeLists.txt
+23 −0 tests/cpplatest/app.manifest
+12 −0 tests/main.cpp
+9 −5 tests/noexcept/CMakeLists.txt
+2 −2 tests/normal/CMakeLists.txt
+50 −0 tests/sanitize-address/CMakeLists.txt
+25 −0 tests/sanitize-undefined-behavior/CMakeLists.txt
+154 −20 tests/wiTest.cpp
+5 −3 tests/win7/CMakeLists.txt
+74 −29 tests/workarounds/wrl/wrl/implements.h
13 changes: 7 additions & 6 deletions projectDocs/dev/createDevEnvironment.md
Original file line number Diff line number Diff line change
Expand Up @@ -65,21 +65,22 @@ If you aren't sure, run `git submodule update` after every git pull, merge or ch
For reference, the following run time dependencies are included in Git submodules:

* [eSpeak NG](https://github.com/espeak-ng/espeak-ng), version 1.52-dev commit `ed9a7bcf`
* [Sonic](https://github.com/waywardgeek/sonic), commit 1d705135
* [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit cbc1f29631780
* [Sonic](https://github.com/waywardgeek/sonic), commit `8694c596378c24e340c09ff2cd47c065494233f1`
* [IAccessible2](https://wiki.linuxfoundation.org/accessibility/iaccessible2/start), commit `3d8c7f0b833453f761ded6b12d8be431507bfe0b`
* [liblouis](http://www.liblouis.io/), version 3.27.0
* [Unicode Common Locale Data Repository (CLDR)](http://cldr.unicode.org/), version 42.0
* NVDA images and sounds
* [Adobe Acrobat accessibility interface, version XI](https://download.macromedia.com/pub/developer/acrobat/AcrobatAccess.zip)
* [Microsoft Detours](https://github.com/microsoft/Detours), commit 45a76a3
* brlapi Python bindings, version 0.8 or later, distributed with [BRLTTY for Windows](https://brltty.app/download.html), version 6.1
* [Microsoft Detours](https://github.com/microsoft/Detours), commit `4b8c659f549b0ab21cf649377c7a84eb708f5e68`
* brlapi Python bindings, version 0.8.5 or later, distributed with [BRLTTY for Windows](https://brltty.app/download.html), version 6.6
* lilli.dll, version 2.1.0.0
* [Python interface to FTDI driver/chip](http://fluidmotion.dyndns.org/zenphoto/index.php?p=news&title=Python-interface-to-FTDI-driver-chip)
* [Nullsoft Install System](https://nsis.sourceforge.io), version 3.08
* Java Access Bridge 32 bit, from Zulu Community OpenJDK build 13.0.1+10Zulu (13.28.11)
* [Java Access Bridge 32 bit, from Zulu Community OpenJDK build 13.0.1+10Zulu (13.28.11)](https://github.com/nvaccess/javaAccessBridge32-bin)
* [wil](https://github.com/microsoft/wil/)
* [Microsoft UI Automation Remote Operations Library, forked from @microsoft by @michaeldcurran](https://www.github.com/michaeldcurran/microsoft-ui-uiautomation/)
* Commit 224b22f3bf9e
* The fork specifically adds support for CallExtension / IsExtensionSupported to the high-level API, see pr microsoft/microsoft-ui-uiautomation#84.
* The fork specifically adds support for CallExtension / IsExtensionSupported to the high-level API, see pr microsoft/microsoft-ui-uiautomation#84 and #95.

Additionally, the following build time dependencies are included in the miscDeps git submodule:

Expand Down
23 changes: 13 additions & 10 deletions tests/system/robot/chromeTests.py
Original file line number Diff line number Diff line change
Expand Up @@ -34,8 +34,12 @@
#: single space is used to separate semantics in braille output.
BRAILLE_SEP = " "

ARIAExamplesDir = os.path.join(
_NvdaLib._locations.repoRoot, "include", "w3c-aria-practices", "examples"
ARIAPatternsDir = os.path.join(
_NvdaLib._locations.repoRoot,
"include",
"w3c-aria-practices",
"content",
"patterns",
)


Expand Down Expand Up @@ -894,7 +898,7 @@ def test_ariaTreeGrid_browseMode():
"""
Ensure that ARIA treegrids are accessible as a standard table in browse mode.
"""
testFile = os.path.join(ARIAExamplesDir, "treegrid", "treegrid-1.html")
testFile = os.path.join(ARIAPatternsDir, "treegrid", "examples", "treegrid-1.html")
_chrome.prepareChrome(
f"""
<iframe src="{testFile}"></iframe>
Expand All @@ -913,7 +917,7 @@ def test_ariaTreeGrid_browseMode():
actualSpeech = _chrome.getSpeechAfterKey("tab")
_asserts.strings_match(
actualSpeech,
"issue 790. link"
"Treegrid Pattern link"
)
# Jump to the ARIA treegrid with the next table quicknav command.
# The browse mode caret will be inside the table on the caption before the first row.
Expand Down Expand Up @@ -991,7 +995,7 @@ def test_ariaCheckbox_browseMode():
"""
Navigate to an unchecked checkbox in reading mode.
"""
testFile = os.path.join(ARIAExamplesDir, "checkbox", "checkbox.html")
testFile = os.path.join(ARIAPatternsDir, "checkbox", "examples", "checkbox.html")
_chrome.prepareChrome(
f"""
<iframe src="{testFile}"></iframe>
Expand Down Expand Up @@ -2234,7 +2238,7 @@ def test_i10890():
# Chrome sometimes exposes tables as clickable, sometimes not.
# This test does not need to know, so disable reporting of clickables.
spy.set_configValue(["documentFormatting", "reportClickable"], False)
testFile = os.path.join(ARIAExamplesDir, "grid", "datagrids.html")
testFile = os.path.join(ARIAPatternsDir, "grid", "examples", "data-grids.html")
_chrome.prepareChrome(
f"""
<iframe src="{testFile}"></iframe>
Expand Down Expand Up @@ -2279,19 +2283,18 @@ def test_ARIASwitchRole():
"""
Ensure that ARIA switch controls have an appropriate role and states in browse mode.
"""
testFile = os.path.join(ARIAExamplesDir, "switch", "switch.html")
testFile = os.path.join(ARIAPatternsDir, "switch", "examples", "switch.html")
_chrome.prepareChrome(
f"""
<iframe src="{testFile}"></iframe>
"""
)
# Jump to the first heading 2 in the iframe.
# Jump to the second heading 2 in the iframe.
_chrome.getSpeechAfterKey("2")
actualSpeech = _chrome.getSpeechAfterKey("2")
_asserts.strings_match(
actualSpeech,
SPEECH_SEP.join([
"frame",
"main landmark",
"Example",
"heading level 2"
]),
Expand Down
2 changes: 1 addition & 1 deletion tests/system/robot/chromeTests.robot
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
# For more details see: https://www.gnu.org/licenses/gpl-2.0.html
*** Settings ***
Documentation HTML test cases in Chrome
Force Tags NVDA smoke test browser chrome excluded_from_build
Force Tags NVDA smoke test browser chrome
# for start & quit in Test Setup and Test Test Teardown
Library NvdaLib.py
Expand Down
11 changes: 9 additions & 2 deletions user_docs/en/changes.t2t
Original file line number Diff line number Diff line change
Expand Up @@ -58,6 +58,13 @@ Add-ons will need to be re-tested and have their manifest updated.
- The ``BrailleDisplayDriver`` base class now has ``numRows`` and ``numCols`` properties to provide information about multi line braille displays.
Setting ``numCells`` is still supported for single line braille displays and ``numCells`` will return the total number of cells for multi line braille displays. (#15386)
- Updated BrlAPI for BRLTTY to version 0.8.5, and its corresponding python module to a Python 3.11 compatible build. (#15652, @LeonarddeR)
- Updated ``include`` dependencies:
- detours to ``4b8c659f549b0ab21cf649377c7a84eb708f5e68``. (#15695)
- ia2 to ``3d8c7f0b833453f761ded6b12d8be431507bfe0b``. (#15695)
- sonic to ``8694c596378c24e340c09ff2cd47c065494233f1``. (#15695)
- w3c-aria-practices to ``9a5e55ccbeb0f1bf92b6127c9865da8426d1c864``. (#15695)
- wil to ``5e9be7b2d2fe3834a7107f430f7d4c0631f69833``. (#15695)
-
-

=== API Breaking Changes ===
Expand All @@ -66,11 +73,11 @@ Please open a GitHub issue if your Add-on has an issue with updating to the new

- NVDA is now built with Python 3.11. (#12064)
- Updated pip dependencies:
- configobj to 5.1.0dev commit e2ba4457. (#15544)
- configobj to 5.1.0dev commit ``e2ba4457c4651fa54f8d59d8dcdd3da950e956b8``. (#15544)
- Comtypes to 1.2.0. (#15513, @codeofdusk)
- fast_diff_match_patch to 2.0.1. (#15514, @codeofdusk)
- Flake8 to 4.0.1. (#15636, @lukaszgo1)
- py2exe to 0.13.0.1dev commit 4e7b2b2c60face592e67cb1bc935172a20fa371d. (#15544)
- py2exe to 0.13.0.1dev commit ``4e7b2b2c60face592e67cb1bc935172a20fa371d``. (#15544)
- robotframework to 6.1.1. (#15544)
- SCons to 4.5.2. (#15529)
- sphinx to 7.2.6. (#15544)
Expand Down

0 comments on commit da446b3

Please sign in to comment.