Skip to content
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

8278472: Invalid value set to CANDIDATEFORM structure #7146

Closed

Conversation

aivanov-jdk
Copy link
Member

@aivanov-jdk aivanov-jdk commented Jan 19, 2022

According to the Windows API reference, dwStyle of CANDIDATEFORM structure should be set to CFS_CANDIDATEPOS or CFS_EXCLUDE. So, CFS_POINT is wrong here.

There are two instances in AwtComponent::SetCandidateWindow in awt_Component.cpp where the incorrect value is used.

Initially, I created this PR for jdk18. It was suggested to place this fix into the mainline, so this a continuation to jdk18/pull/54.


Progress

  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue
  • Change must be properly reviewed

Issue

  • JDK-8278472: Invalid value set to CANDIDATEFORM structure

Reviewers

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.java.net/jdk pull/7146/head:pull/7146
$ git checkout pull/7146

Update a local copy of the PR:
$ git checkout pull/7146
$ git pull https://git.openjdk.java.net/jdk pull/7146/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 7146

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.java.net/jdk/pull/7146.diff

@bridgekeeper
Copy link

bridgekeeper bot commented Jan 19, 2022

👋 Welcome back aivanov! 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 openjdk bot added the rfr label Jan 19, 2022
@openjdk
Copy link

openjdk bot commented Jan 19, 2022

@aivanov-jdk 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 label Jan 19, 2022
@mlbridge
Copy link

mlbridge bot commented Jan 19, 2022

Webrevs

prrace
prrace approved these changes Jan 19, 2022
@openjdk
Copy link

openjdk bot commented Jan 19, 2022

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

8278472: Invalid value set to CANDIDATEFORM structure

Reviewed-by: prr, naoto, serb

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 82 new commits pushed to the master branch:

  • 02390c7: 8279282: [vectorapi] Matcher::supports_vector_comparison_unsigned is not needed on x86
  • 3419ff7: 8277535: Remove redundant Stream.distinct()/sorted() steps
  • d48279b: 8279009: CDS crashes when the source of an InstanceKlass is NULL
  • 9636502: 8279008: G1: Calculate BOT threshold on-the-fly during Object Copy phase
  • 0ea2b39: 8280363: Minor correction of ALPN specification in SSLParameters
  • ec8b6ac: 8234682: The order of @param in the generated docs should match the method signature
  • a4d2019: 8280178: Remove os:: API's that just call system API's
  • 98b157a: 8280146: Parallel: Remove time log tag
  • 20297de: 8280161: com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java fails with SSLException
  • 3f74736: 8280123: C2: Infinite loop in CMoveINode::Ideal during IGVN
  • ... and 72 more: https://git.openjdk.java.net/jdk/compare/7acc4c7dfe4b79e2bf1c993e84fd5fcd6855f292...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 ready label Jan 19, 2022
naotoj
naotoj approved these changes Jan 19, 2022
@mrserb
Copy link
Member

mrserb commented Jan 19, 2022

This change was done under https://bugs.openjdk.java.net/browse/JDK-8147842 where the CFS_CANDIDATEPOS was changed to the CFS_POINT. Please check that the old bug will not be reproduced again.
see http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/8d42ecfa68a3

@aivanov-jdk
Copy link
Member Author

aivanov-jdk commented Jan 20, 2022

This change was done under https://bugs.openjdk.java.net/browse/JDK-8147842 where the CFS_CANDIDATEPOS was changed to the CFS_POINT. Please check that the old bug will not be reproduced again. see http://hg.openjdk.java.net/jdk9/jdk9/jdk/rev/8d42ecfa68a3

Yes, the test works fine, the Chinese-Taiwan CangJie IME window is displayed near the caret as expected.
Chinese-Taiwan CangJie IME

mrserb
mrserb approved these changes Jan 20, 2022
@aivanov-jdk
Copy link
Member Author

aivanov-jdk commented Jan 20, 2022

/integrate

@openjdk
Copy link

openjdk bot commented Jan 20, 2022

Going to push as commit 2426d58.
Since your change was applied there have been 82 commits pushed to the master branch:

  • 02390c7: 8279282: [vectorapi] Matcher::supports_vector_comparison_unsigned is not needed on x86
  • 3419ff7: 8277535: Remove redundant Stream.distinct()/sorted() steps
  • d48279b: 8279009: CDS crashes when the source of an InstanceKlass is NULL
  • 9636502: 8279008: G1: Calculate BOT threshold on-the-fly during Object Copy phase
  • 0ea2b39: 8280363: Minor correction of ALPN specification in SSLParameters
  • ec8b6ac: 8234682: The order of @param in the generated docs should match the method signature
  • a4d2019: 8280178: Remove os:: API's that just call system API's
  • 98b157a: 8280146: Parallel: Remove time log tag
  • 20297de: 8280161: com/sun/net/httpserver/simpleserver/jwebserver/MaxRequestTimeTest.java fails with SSLException
  • 3f74736: 8280123: C2: Infinite loop in CMoveINode::Ideal during IGVN
  • ... and 72 more: https://git.openjdk.java.net/jdk/compare/7acc4c7dfe4b79e2bf1c993e84fd5fcd6855f292...master

Your commit was automatically rebased without conflicts.

@openjdk openjdk bot added the integrated label Jan 20, 2022
@openjdk openjdk bot closed this Jan 20, 2022
@openjdk openjdk bot removed ready rfr labels Jan 20, 2022
@openjdk
Copy link

openjdk bot commented Jan 20, 2022

@aivanov-jdk Pushed as commit 2426d58.

💡 You may see a message that your pull request was closed with unmerged commits. This can be safely ignored.

@aivanov-jdk aivanov-jdk deleted the 8278472-candidateForm branch Feb 21, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
client integrated
4 participants