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

8320692: Null icon returned for .exe without custom icon #2527

Conversation

TheRealMDoerr
Copy link
Contributor

@TheRealMDoerr TheRealMDoerr commented Jun 3, 2024

Clean backport of JDK-8320692.


Progress

  • JDK-8320692 needs maintainer approval
  • Change must not contain extraneous whitespace
  • Commit message must refer to an issue

Issue

  • JDK-8320692: Null icon returned for .exe without custom icon (Bug - P3 - Approved)

Reviewing

Using git

Checkout this PR locally:
$ git fetch https://git.openjdk.org/jdk17u-dev.git pull/2527/head:pull/2527
$ git checkout pull/2527

Update a local copy of the PR:
$ git checkout pull/2527
$ git pull https://git.openjdk.org/jdk17u-dev.git pull/2527/head

Using Skara CLI tools

Checkout this PR locally:
$ git pr checkout 2527

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

Using diff file

Download this PR as a diff file:
https://git.openjdk.org/jdk17u-dev/pull/2527.diff

Webrev

Link to Webrev Comment

@bridgekeeper
Copy link

bridgekeeper bot commented Jun 3, 2024

👋 Welcome back mdoerr! 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 Jun 3, 2024

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

8320692: Null icon returned for .exe without custom icon

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

  • 05e645e: 8322330: JavadocHelperTest.java OOMEs with Parallel GC and ZGC
  • b275236: 8324648: Avoid NoSuchMethodError when instantiating NativePRNG
  • 44ade1d: 8315804: Open source several Swing JTabbedPane JTextArea JTextField tests
  • 0fa4d91: 8310201: Reduce verbose locale output in -XshowSettings launcher option
  • 95432a6: 8322008: Exclude some CDS tests from running with -Xshare:off
  • 9c89f1c: 8320945: problemlist tests failing on latest Windows 11 update

Please see this link for an up-to-date comparison between the source branch of this pull request and the master branch.
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 changed the title Backport 6212264cc6fe428e8d15b7f33e2979c081e432d7 8320692: Null icon returned for .exe without custom icon Jun 3, 2024
@openjdk
Copy link

openjdk bot commented Jun 3, 2024

This backport pull request has now been updated with issue from the original commit.

@openjdk
Copy link

openjdk bot commented Jun 3, 2024

⚠️ @TheRealMDoerr This change is now ready for you to apply for maintainer approval. This can be done directly in each associated issue or by using the /approval command.

@openjdk openjdk bot added the rfr Pull request is ready for review label Jun 3, 2024
@mlbridge
Copy link

mlbridge bot commented Jun 3, 2024

Webrevs

@TheRealMDoerr
Copy link
Contributor Author

TheRealMDoerr commented Jun 4, 2024

/approval request Should get backported for parity with 17.0.12-oracle. Applies cleanly. Tier 1-4 have passed.

@openjdk
Copy link

openjdk bot commented Jun 4, 2024

@TheRealMDoerr
8320692: The approval request has been created successfully.

@openjdk openjdk bot added approval ready Pull request is ready to be integrated and removed approval labels Jun 4, 2024
@TheRealMDoerr
Copy link
Contributor Author

/integrate

@openjdk
Copy link

openjdk bot commented Jun 5, 2024

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

  • 352d258: 8328953: JEditorPane.read throws ChangedCharSetException
  • 4d5ed55: 8332898: failure_handler: log directory of commands
  • a9ee8ba: 8328999: Update GIFlib to 5.2.2
  • 1cec5b1: 8329126: No native wrappers generated anymore with -XX:-TieredCompilation after JDK-8251462
  • 37436e3: 8328218: Delete test java/awt/Window/FindOwner/FindOwner.html
  • ce428dc: 8328234: Remove unused nativeUtils files
  • 44f3dc5: 8328561: test java/awt/Robot/ManualInstructions/ManualInstructions.java isn't used
  • 05e645e: 8322330: JavadocHelperTest.java OOMEs with Parallel GC and ZGC
  • b275236: 8324648: Avoid NoSuchMethodError when instantiating NativePRNG
  • 44ade1d: 8315804: Open source several Swing JTabbedPane JTextArea JTextField tests
  • ... and 3 more: https://git.openjdk.org/jdk17u-dev/compare/09ad130fd4f40278e8b228853c9a4b662521c01d...master

Your commit was automatically rebased without conflicts.

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

openjdk bot commented Jun 5, 2024

@TheRealMDoerr Pushed as commit a0c72d0.

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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport clean integrated Pull request has been integrated
Development

Successfully merging this pull request may close these issues.

1 participant