Skip to content

Conversation

@dmarkov20
Copy link
Member

@dmarkov20 dmarkov20 commented Jan 8, 2025

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 returns 0 because focus rectangle is empty.

It is necessary to check that the focus rectangle is not empty before DrawFocusRect() call.


Progress

  • Change must be properly reviewed (1 review required, with at least 1 Reviewer)
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8346887: DrawFocusRect() may cause an assertion failure (Bug - P4)

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk.git pull/22973/head:pull/22973
$ git checkout pull/22973

Update a local copy of the PR:
$ git checkout pull/22973
$ git pull https://git.openjdk.org/jdk.git pull/22973/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 22973

View PR using the GUI difftool:
$ git pr show -t 22973

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk/pull/22973.diff

Using Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 8, 2025

👋 Welcome back dmarkov! A progress list of the required criteria for merging this PR into master will be added to the body of your pull request. There are additional pull request commands available for use with this pull request.

@openjdk
Copy link

openjdk bot commented Jan 8, 2025

@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:

8346887: DrawFocusRect() may cause an assertion failure

Reviewed-by: aivanov, prr

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 master branch:

  • a641932: 8346310: Duplicate !HAS_PENDING_EXCEPTION check in DynamicArchive::dump_at_exit
  • 49ee4df: 8166983: Remove old/legacy unused tzdata files
  • 3fe0818: 8346099: JFR: Query for 'jfr view' can't handle wildcard with multiple event types
  • 55bcf4c: 8346047: JFR: Incorrect percentile value in 'jfr view'
  • ae3fc46: 8345580: Remove const from Node::_idx which is modified
  • 4d18e5a: 8346872: tools/jpackage/windows/WinLongPathTest.java fails
  • 92ad8a1: 8346052: JFR: Incorrect average value in 'jfr view'
  • 672c413: 8345337: JFR: jfr view should display all direct subfields for an event type
  • afe5434: 8347163: Javadoc error in ConstantPoolBuilder after JDK-8342468
  • f696d9c: 8346239: Improve memory efficiency of JimageDiffGenerator
  • ... and 12 more: https://git.openjdk.org/jdk/compare/c8a9dd3a027781d006850c028714a62903c487d5...master

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 master branch, type /integrate in a new comment.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jan 8, 2025
@openjdk
Copy link

openjdk bot commented Jan 8, 2025

@dmarkov20 The following label will be automatically applied to this pull request:

  • client

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.

@openjdk openjdk bot added the client client-libs-dev@openjdk.org label Jan 8, 2025
@mlbridge
Copy link

mlbridge bot commented Jan 8, 2025

Webrevs

Copy link
Member

@aivanov-jdk aivanov-jdk left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Looks good.

Comment on lines 291 to 292
((drawInfo.itemAction & ODA_FOCUS)||
(drawInfo.itemAction &ODA_DRAWENTIRE))) {
Copy link
Member

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.

@openjdk openjdk bot added the ready Pull request is ready to be integrated label Jan 8, 2025
Copy link
Contributor

@prrace prrace left a 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 ..

@dmarkov20
Copy link
Member Author

/integrate

@openjdk
Copy link

openjdk bot commented Jan 9, 2025

Going to push as commit 8eddf67.
Since your change was applied there have been 33 commits pushed to the master branch:

  • a46ae70: 8339728: [Accessibility,Windows,JAWS] Bug in the getKeyChar method of the AccessBridge class
  • 97dd06c: 8347299: Add annotations to test cases in LicenseTest
  • 0a35ebf: 8347297: Skip the RuntimeImageSymbolicLinksTest test on Windows when it is executed outside of the jtreg
  • b3e8736: 8347296: WinInstallerUiTest fails in local test runs if the path to test work directory is longer that regular
  • 1ade96b: 8347042: Remove an extra parenthesis in macro definition in jfrTraceIdMacros.hpp
  • db7fa6a: 8347289: HKDF delayed provider selection failed with non-extractable PRK
  • 0a5ef82: 8347162: Update problemlist CR for vmTestbase/nsk/jdi/VMOutOfMemoryException
  • ea49537: 8310340: assert(_thread->is_interp_only_mode() || stub_caller) failed: expected a stub-caller
  • 2e00816: 8346671: java/nio/file/Files/probeContentType/Basic.java fails on Windows 2025
  • 88fa3b2: 8346998: Test nsk/jvmti/ResourceExhausted/resexhausted003 fails with java.lang.OutOfMemoryError when CDS is off
  • ... and 23 more: https://git.openjdk.org/jdk/compare/c8a9dd3a027781d006850c028714a62903c487d5...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated Pull request has been integrated label Jan 9, 2025
@openjdk openjdk bot closed this Jan 9, 2025
@openjdk openjdk bot removed ready Pull request is ready to be integrated rfr Pull request is ready for review labels Jan 9, 2025
@openjdk
Copy link

openjdk bot commented Jan 9, 2025

@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))
Copy link
Member

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?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

client client-libs-dev@openjdk.org integrated Pull request has been integrated

Development

Successfully merging this pull request may close these issues.

4 participants