Convert IRawElementProviderSimple to Cswin32 #10177
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ghost
assigned
src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANT.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms.Primitives/src/Interop/UiaCore/Interop.StubFragmentRoot.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/src/System/Windows/Forms/Control.ControlAccessibleObject.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms.Primitives/src/Windows/Win32/PInvoke.UiaRaiseNotificationEvent.cs
Show resolved
Hide resolved
src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Accessibility/UIA_PATTERN_ID.cs
Show resolved
Hide resolved
src/System.Windows.Forms/src/System/Windows/Forms/AccessibleObject.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms/src/System/Windows/Forms/Button.ButtonAccessibleObject.cs
Show resolved
Hide resolved
...itTests/System/Windows/Forms/AccessibleObjects/TabControl.TabControlAccessibleObjectTests.cs
Outdated
Show resolved
Hide resolved
...Forms/tests/UnitTests/System/Windows/Forms/AccessibleObjects/TextBoxAccessibleObjectTests.cs
Outdated
Show resolved
Hide resolved
...tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs
Outdated
Show resolved
Hide resolved
...tests/UnitTests/System/Windows/Forms/AccessibleObjects/ToolStripItemAccessibleObjectTests.cs
Show resolved
Hide resolved
...ndows/Forms/AccessibleObjects/UpDownBase.UpDownButtons.UpDownButtonsAccessibleObjectTests.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms.Primitives/src/Interop/OleAut32/Interop.VARIANT.cs
Outdated
Show resolved
Hide resolved
src/System.Windows.Forms.Primitives/src/System/Windows/Forms/Automation/UiaTextProvider.cs
Show resolved
Hide resolved
lonitra
force-pushed
the
elementprovider
branch
from
e6588ca to
c6dd5be
Compare
lonitra
force-pushed
the
elementprovider
branch
from
e8dfb70 to
2a1d70c
Compare
Tanya-Solyanik
previously approved these changes
Nov 3, 2023
src/System.Windows.Forms.Primitives/src/Windows/Win32/UI/Accessibility/UIAHelper.cs
Outdated
Show resolved
Hide resolved
Tanya-Solyanik
approved these changes
Nov 3, 2023
gpetrou
pushed a commit
to gpetrou/winforms
that referenced
this pull request
Nov 3, 2023
* Convert IRawElementProviderSimple to Cswin32 * Add tests and fix XAccessibleObjectTests * more test updates * Use Cswin32 definition of ProviderOptions * Remove s_notificationEventAvailable from AccessibleObject and only use OS check * Preserve sig and update Interop.AccessibleObject tests * Place 1709 OSCheck inside PInvoke * Remove nint -> VARIANT operator and return VT_I4 VARIANTs for handles * use IUnknown* -> VARIANT explicit operator * Add VARIANT.True and VARIANT.False * Add WindowHandleToVariant helper method * address other feedback * remove unused variable * remove unused using * Update VARIANT.True and VARIANT.False * Update new file TreeViewLabelEditAccessibleObjectTests * clean up * Add more detail doc and add debug assert * Remove locale from link
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Related: #9795
This change converts
IRawElementProviderSimpleto use Cswin32 definition. This interface includes definition ofGetPropertyValue, which now returnsVARIANTinstead ofobject, so the bulk of this change involves casting what was returned fromGetPropertyValueto typeVARIANTin XAccessibleObject. Note we cannot directly cast enums/structs toVARIANTso these need to be first casted to what they really represent e.g.intornintbefore casting toVARIANT.Other changes include:
UiaDisconnectProvider,UiaHostProviderFromHwnd,UiaRaiseAutomationEvent,UiaRaiseAutomationPropertyChangedEvent,UiaRaiseNotificationEvent,UiaRaiseStructureChangedEvent,UiaReturnRawElementProviderto Cswin32IsWindows10_1709OrGreater()API sinceUiaRaiseNotificationEventrequires it. We didn't have this check before, so I also kept old definition ofUiaRaiseNotificationEventin cases where the OS version requirement is not metSafeArrayScopethat takes an array and add testGetPropertyValueno longer returnsobjectI tried to separate the test changes from the actual changes to make this somewhat easier to digest for review.
Microsoft Reviewers: Open in CodeFlow