-
Notifications
You must be signed in to change notification settings - Fork 6.2k
8346887: DrawFocusRect() may cause an assertion failure #22973
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.
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
Conversation
|
👋 Welcome back dmarkov! A progress list of the required criteria for merging this PR into |
|
@dmarkov20 This change now passes all automated pre-integration checks. ℹ️ This project also has non-automated pre-integration requirements. Please see the file CONTRIBUTING.md for details. After integration, the commit message for the final commit will be: You can use pull request commands such as /summary, /contributor and /issue to adjust it as needed. At the time when this comment was updated there had been 22 new commits pushed to the
As there are no conflicts, your changes will automatically be rebased on top of these commits when integrating. If you prefer to avoid this automatic rebasing, please check the documentation for the /integrate command for further details. ➡️ To integrate this PR with the above commit message to the |
|
@dmarkov20 The following label will be automatically applied to this pull request:
When this pull request is ready to be reviewed, an "RFR" email will be sent to the corresponding mailing list. If you would like to change these labels, use the /label pull request command. |
aivanov-jdk
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Looks good.
| ((drawInfo.itemAction & ODA_FOCUS)|| | ||
| (drawInfo.itemAction &ODA_DRAWENTIRE))) { |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
These two lines ask for spacing adjustment, but it would hide the real fix.
prrace
left a comment
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
I'm a bit surprised that there's no Microsoft doc on the assert ..
|
/integrate |
|
Going to push as commit 8eddf67.
Your commit was automatically rebased without conflicts. |
|
@dmarkov20 Pushed as commit 8eddf67. 💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored. |
| VERIFY(::CopyRect(&focusRect, &rect)); | ||
| VERIFY(::InflateRect(&focusRect,-inf,-inf)); | ||
| if(::DrawFocusRect(hDC, &focusRect) == 0) | ||
| if (!::IsRectEmpty(&focusRect) && (::DrawFocusRect(hDC, &focusRect) == 0)) |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
If the "focusRect" is empty why we cannot skip most of this method?
On Windows debug build execution of
DrawFocusRect()may cause an assertion failure. In particular if a component, which is going to gain a focus, has zero size, the function returns0because focus rectangle is empty.It is necessary to check that the focus rectangle is not empty before
DrawFocusRect()call.Progress
Issue
Reviewers
Reviewing
Using
gitCheckout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22973/head:pull/22973$ git checkout pull/22973Update a local copy of the PR:
$ git checkout pull/22973$ git pull https://git.openjdk.org/jdk.git pull/22973/headUsing Skara CLI tools
Checkout this PR locally:
$ git pr checkout 22973View PR using the GUI difftool:
$ git pr show -t 22973Using diff file
Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22973.diff
Using Webrev
Link to Webrev Comment