Fix UIA RangeFromPoint API #17695
Merged
Fix UIA RangeFromPoint API #17695
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
microsoft-github-policy-service
bot
added
Issue-Bug
DHowett
reviewed
Aug 14, 2024
| { | ||
| ScreenToClient(_getWindowHandle(), screenPoint->as_win32_point()); | ||
| ScreenToClient(_getWindowHandle(), screenPoint.as_win32_point()); |
There was a problem hiding this comment.
@lhecker this weirds me out - I think we are writing through the return value of as_win32_point? Is that safe?
There was a problem hiding this comment.
It's definitely less than 3.6 roentgen.
lhecker
approved these changes
Aug 14, 2024
DHowett
reviewed
Aug 14, 2024
microsoft-github-policy-service
bot
added
the
Needs-Author-Feedback
This reverts commit 7e26412.
microsoft-github-policy-service
bot
removed
the
Needs-Author-Feedback
DHowett
approved these changes
Aug 20, 2024
DHowett
pushed a commit
that referenced
this pull request
Aug 21, 2024
## Summary of the Pull Request Fixes the `RangeFromPoint` API such that we're now properly locking when we attempt to retrieve the viewport data. This also corrects the conversion from `UiaPoint` (screen position) to buffer coordinates (buffer cell). Closes #17579 ## Detailed Description of the Pull Request / Additional comments - `UiaTextRangeBase::Initialize(UiaPoint)`: - reordered logic to clamp to client area first, then begin conversion to buffer coordinates - properly lock when retrieving the viewport data - updated `_TranslatePointToScreen` and `_TranslatePointFromScreen` to use `&` instead of `*` - we weren't properly updating the parameter before - `TermControlUiaTextRange::_TranslatePointFromScreen()` - `includeOffsets` was basically copied over from `_TranslatePointToScreen`. The math itself was straight up wrong since we had to do it backwards. ## Validation Steps Performed ✅ Moved WT to top-left of monitor, then used inspect.exe to call `RangeFromPoint` API when mouse cursor is on top-left buffer cell (also meticulously stepped through the two functions ensuring everything was correct). (cherry picked from commit 7b39d24) Service-Card-Id: PVTI_lADOAF3p4s4AmhmszgSC930 PVTI_lADOAF3p4s4AmhmszgSCpCs Service-Version: 1.21
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
Summary of the Pull Request
Fixes the
RangeFromPointAPI such that we're now properly locking when we attempt to retrieve the viewport data. This also corrects the conversion fromUiaPoint(screen position) to buffer coordinates (buffer cell).Closes #17579
Detailed Description of the Pull Request / Additional comments
UiaTextRangeBase::Initialize(UiaPoint):_TranslatePointToScreenand_TranslatePointFromScreento use&instead of*TermControlUiaTextRange::_TranslatePointFromScreen()includeOffsetswas basically copied over from_TranslatePointToScreen. The math itself was straight up wrong since we had to do it backwards.Validation Steps Performed
✅ Moved WT to top-left of monitor, then used inspect.exe to call
RangeFromPointAPI when mouse cursor is on top-left buffer cell (also meticulously stepped through the two functions ensuring everything was correct).